Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1462746

[PATCH 4/7] ARM: dts: STiH407: Move non-removable property to board file

From Lee Jones <lee.jones@linaro.org>
Newsgroups linux.kernel
Subject [PATCH 4/7] ARM: dts: STiH407: Move non-removable property to board file
Date 2016-08-15 14:20 +0200
Message-ID <s6p22-5sa-31@gated-at.bofh.it> (permalink)
References <s6p21-5sa-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Patrice Chotard <patrice.chotard@st.com>

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>
---
 arch/arm/boot/dts/stih407-family.dtsi | 1 -
 arch/arm/boot/dts/stih418-b2199.dts   | 1 +
 arch/arm/boot/dts/stihxxx-b2120.dtsi  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index d294e824..59fea05 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 772d2bb..7c45e75 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 133375b..0b0dd02 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";
 		};
 
-- 
2.9.0

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/7] ARM: dts: STi: Make way for new Linaro 96Board: ST B2260 Lee Jones <lee.jones@linaro.org> - 2016-08-15 14:20 +0200
  [PATCH 3/7] ARM: dts: STiH407-pinctrl: Add i2c2_alt2_1 node Lee Jones <lee.jones@linaro.org> - 2016-08-15 14:20 +0200
  [PATCH 1/7] ARM: dts: STiH407: Move pio20 node to fix kernel warning Lee Jones <lee.jones@linaro.org> - 2016-08-15 14:20 +0200
  [PATCH 7/7] ARM: dts: STi: Introduce B2260 board Lee Jones <lee.jones@linaro.org> - 2016-08-15 14:20 +0200
  [PATCH 4/7] ARM: dts: STiH407: Move non-removable property to board file Lee Jones <lee.jones@linaro.org> - 2016-08-15 14:20 +0200
  [PATCH 5/7] ARM: dts: STiH407-pinctrl: Add pinctrl_rgmii1_mdio_1 node Lee Jones <lee.jones@linaro.org> - 2016-08-15 14:20 +0200

csiph-web