diff options
| author | Patrice Chotard <patrice.chotard@st.com> | 2016-07-11 15:14:16 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-08-12 11:38:48 +0100 |
| commit | 50e1ac6e5268a5a66c7e2004e1edea6b2ab3d249 (patch) | |
| tree | f84fc02cf4b98f82abe1ac80e1b04a90cc701dc2 | |
| parent | 0389ba40cf321184c71c364d93c5abdf88b6d1f3 (diff) | |
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>
| -rw-r--r-- | arch/arm/boot/dts/stih407-family.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/stih418-b2199.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/stihxxx-b2120.dtsi | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index d294e82447a2..59fea05b1e8a 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -553,7 +553,6 @@ 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 772d2bb07e5f..7c45e75b4c96 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -86,6 +86,7 @@ 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 133375bc8aa5..0b0dd024f72d 100644 --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi @@ -65,6 +65,7 @@ }; mmc0: sdhci@09060000 { + non-removable; status = "okay"; }; |