Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx51.dtsi

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 5c4ba91e43ba4b2e797d3d34dea32093f9a1f0e6..67d462715048f28da7ec9caec5af01ab4741816d 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -197,7 +197,7 @@
                                        status = "disabled";
                                };
 
-                               ecspi1: ecspi@70010000 {
+                               ecspi1: spi@70010000 {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
                                        compatible = "fsl,imx51-ecspi";
@@ -464,7 +464,7 @@
                                status = "disabled";
                        };
 
-                       ecspi2: ecspi@83fac000 {
+                       ecspi2: spi@83fac000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "fsl,imx51-ecspi";
@@ -487,7 +487,7 @@
                                fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin";
                        };
 
-                       cspi: cspi@83fc0000 {
+                       cspi: spi@83fc0000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "fsl,imx51-cspi", "fsl,imx35-cspi";
@@ -608,7 +608,7 @@
                                status = "disabled";
                        };
 
-                       vpu@83ff4000 {
+                       vpu: vpu@83ff4000 {
                                compatible = "fsl,imx51-vpu", "cnm,codahx4";
                                reg = <0x83ff4000 0x1000>;
                                interrupts = <9>;