Skip to contentSkip to conversation

mvebu: pinctrl: apply SDHCI PHY config for A7K

PATCH In review Pali Rohár 2 participants 3 messages Jul 25, 2022 – Jul 29, 2022

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

PATCH 1/1 mvebu: pinctrl: apply SDHCI PHY config for A7K

From: Konstantin Porotchkin <[email protected]>

Current pin control driver applies SDHCI PHY MUX selection when board DT calls for eMMC function on MPP wires. However, for CP side eMMC, only the "armada-8k-cpm-pinctrl" compatibility string is taken into account, which causes CP-SDHCI on Armada-7K boards to fail.
This patch adds "armada-7k-pinctrl" compatibility string handling for the CP-SDHCI PHY configuration case.

---
 drivers/pinctrl/mvebu/pinctrl-mvebu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/mvebu/pinctrl-mvebu.c +3 -1
index 536c6aff96e5..fd49a97b5b0a 100644
@@ -52,7 +52,9 @@ void mvebu_pinctl_emmc_set_mux(struct udevice *dev, u32 pin, u32 func)
 				     EMMC_PHY_CTRL_SDPHY_EN);
 		}
 	} else if (!fdt_node_check_compatible(blob, node,
-					"marvell,armada-8k-cpm-pinctrl")) {
+					"marvell,armada-8k-cpm-pinctrl") ||
+		   !fdt_node_check_compatible(blob, node,
+					"marvell,armada-7k-pinctrl")) {
 		if ((pin == CP110_EMMC_CLK_PIN_ID) &&
 		    (func == CP110_EMMC_CLK_FUNC)) {
 			clrbits_le32(priv->base_reg + CP_EMMC_PHY_CTRL_REG,
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Pali Rohár

From: Konstantin Porotchkin <[email protected]>

Current pin control driver applies SDHCI PHY MUX selection when board DT calls for eMMC function on MPP wires. However, for CP side eMMC, only the "armada-8k-cpm-pinctrl" compatibility string is taken into account, which causes CP-SDHCI on Armada-7K boards to fail.
This patch adds "armada-7k-pinctrl" compatibility string handling for the CP-SDHCI PHY configuration case.

Quoted 2 lines

Thanks,
Stefan

Quoted 9 lines
---
  drivers/pinctrl/mvebu/pinctrl-mvebu.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/mvebu/pinctrl-mvebu.c +0 -0
index 536c6aff96e5..fd49a97b5b0a 100644

drivers/pinctrl/mvebu/pinctrl-mvebu.c void mvebu_pinctl_emmc_set_mux(struct udevice *dev, u32 pin, u32 func) · line 60

Quoted 10 lines
drivers/pinctrl/mvebu/pinctrl-mvebu.c +3 -1
@@ -52,7 +52,9 @@ void mvebu_pinctl_emmc_set_mux(struct udevice *dev, u32 pin, u32 func)
  				     EMMC_PHY_CTRL_SDPHY_EN);
  		}
  	} else if (!fdt_node_check_compatible(blob, node,
-					"marvell,armada-8k-cpm-pinctrl")) {
+					"marvell,armada-8k-cpm-pinctrl") ||
+		   !fdt_node_check_compatible(blob, node,
+					"marvell,armada-7k-pinctrl")) {
  		if ((pin == CP110_EMMC_CLK_PIN_ID) &&
  		    (func == CP110_EMMC_CLK_FUNC)) {
  			clrbits_le32(priv->base_reg + CP_EMMC_PHY_CTRL_REG,

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
#2 lore raw
In reply to Pali Rohár
Quoted 10 lines · Pali Rohár

From: Konstantin Porotchkin <[email protected]>

Current pin control driver applies SDHCI PHY MUX selection when board DT calls for eMMC function on MPP wires. However, for CP side eMMC, only the "armada-8k-cpm-pinctrl" compatibility string is taken into account, which causes CP-SDHCI on Armada-7K boards to fail.
This patch adds "armada-7k-pinctrl" compatibility string handling for the CP-SDHCI PHY configuration case.

Quoted 2 lines

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 9 lines
---
  drivers/pinctrl/mvebu/pinctrl-mvebu.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/mvebu/pinctrl-mvebu.c +0 -0
index 536c6aff96e5..fd49a97b5b0a 100644

drivers/pinctrl/mvebu/pinctrl-mvebu.c void mvebu_pinctl_emmc_set_mux(struct udevice *dev, u32 pin, u32 func) · line 60

Quoted 10 lines
drivers/pinctrl/mvebu/pinctrl-mvebu.c +3 -1
@@ -52,7 +52,9 @@ void mvebu_pinctl_emmc_set_mux(struct udevice *dev, u32 pin, u32 func)
  				     EMMC_PHY_CTRL_SDPHY_EN);
  		}
  	} else if (!fdt_node_check_compatible(blob, node,
-					"marvell,armada-8k-cpm-pinctrl")) {
+					"marvell,armada-8k-cpm-pinctrl") ||
+		   !fdt_node_check_compatible(blob, node,
+					"marvell,armada-7k-pinctrl")) {
  		if ((pin == CP110_EMMC_CLK_PIN_ID) &&
  		    (func == CP110_EMMC_CLK_FUNC)) {
  			clrbits_le32(priv->base_reg + CP_EMMC_PHY_CTRL_REG,

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]