Merge tag 'sound-fix-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx23-sansa.dts

diff --git a/arch/arm/boot/dts/imx23-sansa.dts b/arch/arm/boot/dts/imx23-sansa.dts
index 67de7863ad795718d03cabd590e070a70d508f7b..46057d9bf555b61885e5d19375e1c1c4bae7db72 100644 (file)
--- a/arch/arm/boot/dts/imx23-sansa.dts
+++ b/arch/arm/boot/dts/imx23-sansa.dts
@@ -50,12 +50,13 @@
        compatible = "sandisk,sansa_fuze_plus", "fsl,imx23";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x04000000>;
        };
 
        apb@80000000 {
                apbh@80000000 {
-                       ssp0: ssp@80010000 {
+                       ssp0: spi@80010000 {
                                compatible = "fsl,imx23-mmc";
                                pinctrl-names = "default";
                                pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
@@ -65,7 +66,7 @@
                                status = "okay";
                        };
 
-                       ssp1: ssp@80034000 {
+                       ssp1: spi@80034000 {
                                compatible = "fsl,imx23-mmc";
                                pinctrl-names = "default";
                                pinctrl-0 = <&mmc1_8bit_pins_a>;