Merge tag 'uuid-for-4.14' of git://git.infradead.org/users/hch/uuid

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / rk3288-rock2-som.dtsi

diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
index 749a9b86e6e27c9a1d7d5e50786022d6804d24e5..b9c471fcbd42b080305e2c89318dd2bea4036603 100644 (file)
--- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
@@ -43,7 +43,7 @@
 
 / {
        memory@0 {
-               reg = <0x0 0x80000000>;
+               reg = <0x0 0x0 0x0 0x80000000>;
                device_type = "memory";
        };
 
@@ -89,7 +89,6 @@
        cap-mmc-highspeed;
        disable-wp;
        non-removable;
-       num-slots = <1>;
        mmc-pwrseq = <&emmc_pwrseq>;
        pinctrl-names = "default";
        pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;