Skip to contentSkip to conversation

ARM: dts: stm32: Fix AV96 eMMC pinmux

PATCH In review Marek Vasut 2 participants 3 messages Jul 20, 2021 – Jul 27, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: stm32: Fix AV96 eMMC pinmux

Commit 500327e2ea7 ("ARM: dts: stm32mp1: DT alignment with Linux kernel v5.8-rc1") renamed sdmmc2_d47_pins_b phandle to sdmmc2_d47_pins_c, but without updating the AV96 DT which uses that phandle. Linux missed similar update as well and it was only added in commit 1ad6e36ec266 ("ARM: dts: stm32: Fix sdmmc2 pins on AV96") .

Update the AV96 DT pinmux phandle, otherwise eMMC 8bit mode does not work and access to eMMC takes a very long time to fall back to 4bit mode.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
 arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi | 2 +-
 arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi +1 -1
index 1ae57e18542..8b275e4950e 100644
@@ -57,7 +57,7 @@
 	};
 };
 
-&sdmmc2_d47_pins_b {
+&sdmmc2_d47_pins_c {
 	u-boot,dm-spl;
 	pins {
 		u-boot,dm-spl;
arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts +1 -1
index 9b5dda318ec..0e860e5cf88 100644
@@ -152,7 +152,7 @@
 
 &sdmmc2 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_b>;
+	pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_c>;
 	non-removable;
 	no-sd;
 	no-sdio;
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw

Hi Marek,

Quoted 35 lines · Marek Vasut

Commit 500327e2ea7 ("ARM: dts: stm32mp1: DT alignment with Linux kernel v5.8-rc1") renamed sdmmc2_d47_pins_b phandle to sdmmc2_d47_pins_c, but without updating the AV96 DT which uses that phandle. Linux missed similar update as well and it was only added in commit 1ad6e36ec266 ("ARM: dts: stm32: Fix sdmmc2 pins on AV96") .

Update the AV96 DT pinmux phandle, otherwise eMMC 8bit mode does not work and access to eMMC takes a very long time to fall back to 4bit mode.

Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
  arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi | 2 +-
  arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts         | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi +1 -1
index 1ae57e18542..8b275e4950e 100644
@@ -57,7 +57,7 @@
  	};
  };
 
-&sdmmc2_d47_pins_b {
+&sdmmc2_d47_pins_c {
  	u-boot,dm-spl;
  	pins {
  		u-boot,dm-spl;
arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts +0 -0
index 9b5dda318ec..0e860e5cf88 100644

arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts line 158

Quoted 8 lines
arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts +1 -1
@@ -152,7 +152,7 @@
 
  &sdmmc2 {
  	pinctrl-names = "default";
-	pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_b>;
+	pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_c>;
  	non-removable;
  	no-sd;
  	no-sdio;

And sorry for the alignment issue.

Thanks
Patrick

#2 lore raw
In reply to Marek Vasut

Hi,

Quoted 9 lines · Marek Vasut

Commit 500327e2ea7 ("ARM: dts: stm32mp1: DT alignment with Linux kernel v5.8-rc1") renamed sdmmc2_d47_pins_b phandle to sdmmc2_d47_pins_c, but without updating the AV96 DT which uses that phandle. Linux missed similar update as well and it was only added in commit 1ad6e36ec266 ("ARM: dts: stm32: Fix sdmmc2 pins on AV96") .

Update the AV96 DT pinmux phandle, otherwise eMMC 8bit mode does not work and access to eMMC takes a very long time to fall back to 4bit mode.

Quoted 8 lines
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
  arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi | 2 +-
  arch/arm/dts/stm32mp15xx-dhcor-avenger96.dts         | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to u-boot-stm/master, thanks!

Regards
Patrick