ARM: dts: STiH407: Move non-removable property to board file

Due to 96board which uses mmc0 node for SD card, the non-removable
property must be moved from STiH407-family to board file for B2120
and B2199 boards.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Peter Griffin <peter.griffin@linaro.org>

diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index d294e82447a292bb24e0989191494693f7ee0ac3..59fea05b1e8a0d22af540c903015f76db6559ef6 100644 (file)
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -553,7 +553,6 @@ mmc0: sdhci@09060000 {
                        clock-names = "mmc";
                        clocks = <&clk_s_c0_flexgen CLK_MMC_0>;
                        bus-width = <8>;
-                       non-removable;
                };
 
                mmc1: sdhci@09080000 {

diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts
index 772d2bb07e5f91c8a27156744601a6eb682679d7..7c45e75b4c96501643b8877b98896c212b731a9b 100644 (file)
--- a/arch/arm/boot/dts/stih418-b2199.dts
+++ b/arch/arm/boot/dts/stih418-b2199.dts
@@ -86,6 +86,7 @@ mmc0: sdhci@09060000 {
                        sd-uhs-sdr50;
                        sd-uhs-sdr104;
                        sd-uhs-ddr50;
+                       non-removable;
                };
 
                miphy28lp_phy: miphy28lp@9b22000 {

diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index 133375bc8aa503d57f85a2b0026ff432b496a2d3..0b0dd024f72dd93725ec50119745368bb26d41c7 100644 (file)
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -65,6 +65,7 @@ i2c@9540000 {
                };
 
                mmc0: sdhci@09060000 {
+                       non-removable;
                        status = "okay";
                };