* [PATCH 1/3] ARM: dts: stm32: add cd-gpios properties for SD-cards on STM32MP1 boards
2020-03-04 8:09 [PATCH 0/3] Update SDMMC nodes on STM32MP1 boards Yann Gautier
@ 2020-03-04 8:09 ` Yann Gautier
2020-03-04 8:09 ` [PATCH 2/3] ARM: dts: stm32: add disable-wp property for SD-card " Yann Gautier
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Yann Gautier @ 2020-03-04 8:09 UTC (permalink / raw)
To: Maxime Coquelin, Alexandre Torgue, Rob Herring, Mark Rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Cc: Yann Gautier
The broken-cd properties are replaced with cd-gpios, with the correct
GPIO to detect the card insertion. The GPIO lines require a pull-up.
Signed-off-by: Yann Gautier <yann.gautier@st.com>
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 2 +-
arch/arm/boot/dts/stm32mp157c-ed1.dts | 2 +-
arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index cbfa4075907e..2bdfab192a39 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -300,7 +300,7 @@
pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_a>;
pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
- broken-cd;
+ cd-gpios = <&gpioi 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
st,sig-dir;
st,neg-edge;
st,use-ckin;
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
index 1fc43251d697..5daaec3aec9b 100644
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -313,7 +313,7 @@
pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_a>;
pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_dir_pins_a>;
pinctrl-2 = <&sdmmc1_b4_sleep_pins_a &sdmmc1_dir_sleep_pins_a>;
- broken-cd;
+ cd-gpios = <&gpiog 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
st,sig-dir;
st,neg-edge;
st,use-ckin;
diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
index f6672e87aef3..02d52eb3c34f 100644
--- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
@@ -479,7 +479,7 @@
pinctrl-0 = <&sdmmc1_b4_pins_a>;
pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
- broken-cd;
+ cd-gpios = <&gpiob 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
st,neg-edge;
bus-width = <4>;
vmmc-supply = <&v3v3>;
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] ARM: dts: stm32: add disable-wp property for SD-card on STM32MP1 boards
2020-03-04 8:09 [PATCH 0/3] Update SDMMC nodes on STM32MP1 boards Yann Gautier
2020-03-04 8:09 ` [PATCH 1/3] ARM: dts: stm32: add cd-gpios properties for SD-cards " Yann Gautier
@ 2020-03-04 8:09 ` Yann Gautier
2020-03-04 8:09 ` [PATCH 3/3] ARM: dts: stm32: use correct vqmmc regu for eMMC on stm32mp1 ED1/EV1 boards Yann Gautier
2020-03-13 13:26 ` [PATCH 0/3] Update SDMMC nodes on STM32MP1 boards Alexandre Torgue
3 siblings, 0 replies; 5+ messages in thread
From: Yann Gautier @ 2020-03-04 8:09 UTC (permalink / raw)
To: Maxime Coquelin, Alexandre Torgue, Rob Herring, Mark Rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Cc: Yann Gautier
On STM32MP1 DK1, DK2, ED1 and EV1 boards, there is only a micro SD socket.
This is also the case on Avenger board.
They don't support the Write Protect pin.
The disable-wp is then added in the SD-cards sdmmc1 nodes.
This avoids executing some code and a warning during driver probe.
Signed-off-by: Yann Gautier <yann.gautier@st.com>
---
arch/arm/boot/dts/stm32mp157a-avenger96.dts | 1 +
arch/arm/boot/dts/stm32mp157c-ed1.dts | 1 +
arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 1 +
3 files changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/stm32mp157a-avenger96.dts b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
index 2bdfab192a39..8e060219751b 100644
--- a/arch/arm/boot/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/boot/dts/stm32mp157a-avenger96.dts
@@ -301,6 +301,7 @@
pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
cd-gpios = <&gpioi 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+ disable-wp;
st,sig-dir;
st,neg-edge;
st,use-ckin;
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
index 5daaec3aec9b..6f8d23a7d4a6 100644
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -314,6 +314,7 @@
pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_dir_pins_a>;
pinctrl-2 = <&sdmmc1_b4_sleep_pins_a &sdmmc1_dir_sleep_pins_a>;
cd-gpios = <&gpiog 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+ disable-wp;
st,sig-dir;
st,neg-edge;
st,use-ckin;
diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
index 02d52eb3c34f..6897119cadc9 100644
--- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
@@ -480,6 +480,7 @@
pinctrl-1 = <&sdmmc1_b4_od_pins_a>;
pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;
cd-gpios = <&gpiob 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+ disable-wp;
st,neg-edge;
bus-width = <4>;
vmmc-supply = <&v3v3>;
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] ARM: dts: stm32: use correct vqmmc regu for eMMC on stm32mp1 ED1/EV1 boards
2020-03-04 8:09 [PATCH 0/3] Update SDMMC nodes on STM32MP1 boards Yann Gautier
2020-03-04 8:09 ` [PATCH 1/3] ARM: dts: stm32: add cd-gpios properties for SD-cards " Yann Gautier
2020-03-04 8:09 ` [PATCH 2/3] ARM: dts: stm32: add disable-wp property for SD-card " Yann Gautier
@ 2020-03-04 8:09 ` Yann Gautier
2020-03-13 13:26 ` [PATCH 0/3] Update SDMMC nodes on STM32MP1 boards Alexandre Torgue
3 siblings, 0 replies; 5+ messages in thread
From: Yann Gautier @ 2020-03-04 8:09 UTC (permalink / raw)
To: Maxime Coquelin, Alexandre Torgue, Rob Herring, Mark Rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Cc: Yann Gautier
On those boards, as stated in schematics files, the regulator used for IOs
is VDD. It was wrongly set to v3v3.
Signed-off-by: Yann Gautier <yann.gautier@st.com>
---
arch/arm/boot/dts/stm32mp157c-ed1.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
index 6f8d23a7d4a6..ae6f80f9794e 100644
--- a/arch/arm/boot/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -335,7 +335,7 @@
st,neg-edge;
bus-width = <8>;
vmmc-supply = <&v3v3>;
- vqmmc-supply = <&v3v3>;
+ vqmmc-supply = <&vdd>;
mmc-ddr-3_3v;
status = "okay";
};
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] Update SDMMC nodes on STM32MP1 boards
2020-03-04 8:09 [PATCH 0/3] Update SDMMC nodes on STM32MP1 boards Yann Gautier
` (2 preceding siblings ...)
2020-03-04 8:09 ` [PATCH 3/3] ARM: dts: stm32: use correct vqmmc regu for eMMC on stm32mp1 ED1/EV1 boards Yann Gautier
@ 2020-03-13 13:26 ` Alexandre Torgue
3 siblings, 0 replies; 5+ messages in thread
From: Alexandre Torgue @ 2020-03-13 13:26 UTC (permalink / raw)
To: Yann Gautier, Maxime Coquelin, Rob Herring, Mark Rutland,
linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Hi Yann
On 3/4/20 9:09 AM, Yann Gautier wrote:
> This patchset updates the sdmmc nodes for STM32MP1.
> For SD cards nodes, the cd-gpio property is used instead of broken-cd,
> and the disable-wp property is added.
> The last patch corrects the vqmmc regulator for eMMC on ED1/EV1 boards.
>
> Yann Gautier (3):
> ARM:dts: stm32: add cd-gpios properties for SD-cards on STM32MP1
> boards
> ARM: dts: stm32: add disable-wp property for SD-card on STM32MP1
> boards
> ARM: dts: stm32: use correct vqmmc regu for eMMC on stm32mp1 ED1/EV1
> boards
>
> arch/arm/boot/dts/stm32mp157a-avenger96.dts | 3 ++-
> arch/arm/boot/dts/stm32mp157c-ed1.dts | 5 +++--
> arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 3 ++-
> 3 files changed, 7 insertions(+), 4 deletions(-)
>
Series applied on stm32-next.
Regards
Alex
^ permalink raw reply [flat|nested] 5+ messages in thread