Merge branch 'omap-for-v4.20/defconfig' into omap-for-v4.21/defconfig

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx28-duckbill.dts

diff --git a/arch/arm/boot/dts/imx28-duckbill.dts b/arch/arm/boot/dts/imx28-duckbill.dts
index f286bfe699bee17135649b425d6081600bfa54af..16f524428ed701c3bef7f8081357ce4afc3466ac 100644 (file)
--- a/arch/arm/boot/dts/imx28-duckbill.dts
+++ b/arch/arm/boot/dts/imx28-duckbill.dts
@@ -24,7 +24,7 @@
 
        apb@80000000 {
                apbh@80000000 {
-                       ssp0: ssp@80010000 {
+                       ssp0: spi@80010000 {
                                compatible = "fsl,imx28-mmc";
                                pinctrl-names = "default";
                                pinctrl-0 = <&mmc0_4bit_pins_a
@@ -34,7 +34,7 @@
                                status = "okay";
                        };
 
-                       ssp2: ssp@80014000 {
+                       ssp2: spi@80014000 {
                                compatible = "fsl,imx28-spi";
                                pinctrl-names = "default";
                                pinctrl-0 = <&spi2_pins_a>;