Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 7fae2ffb76fe2e63ecb4fe8a515b61a65dd99421..95b7fba58300fffd08508538798fbfa2f8bfcebe 100644 (file)
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -140,7 +140,7 @@
                                        status = "disabled";
                                };
 
-                               ecspi1: ecspi@50010000 {
+                               ecspi1: spi@50010000 {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
                                        compatible = "fsl,imx50-ecspi", "fsl,imx51-ecspi";
@@ -403,7 +403,7 @@
                                status = "disabled";
                        };
 
-                       ecspi2: ecspi@63fac000 {
+                       ecspi2: spi@63fac000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "fsl,imx50-ecspi", "fsl,imx51-ecspi";
@@ -426,7 +426,7 @@
                                fsl,sdma-ram-script-name = "imx/sdma/sdma-imx50.bin";
                        };
 
-                       cspi: cspi@63fc0000 {
+                       cspi: spi@63fc0000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "fsl,imx50-cspi", "fsl,imx35-cspi";