Merge tag 'trace-v5.0-pre' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / vf610-zii-ssmb-spu3.dts

diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
index fe357668865bbcc8e7c03f58bffb4c90454ad40d..0d9fe5ac83a37574b48b1297021e2542fc872f32 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
+++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
@@ -24,6 +24,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 
@@ -98,6 +99,8 @@
        non-removable;
        no-1-8-v;
        keep-power-in-suspend;
+       no-sdio;
+       no-sd;
        status = "okay";
 };
 
@@ -105,6 +108,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_esdhc1>;
        bus-width = <4>;
+       no-sdio;
        status = "okay";
 };