* [PATCH] mvebu: pinctrl: apply SDHCI PHY config for A7K
@ 2022-07-25 12:13 Pali Rohár
2022-07-28 6:33 ` Stefan Roese
2022-07-29 12:01 ` Stefan Roese
0 siblings, 2 replies; 3+ messages in thread
From: Pali Rohár @ 2022-07-25 12:13 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot
From: Konstantin Porotchkin <kostap@marvell.com>
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.
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-by: Igal Liberman <igall@marvell.com>
---
drivers/pinctrl/mvebu/pinctrl-mvebu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index 536c6aff96e5..fd49a97b5b0a 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -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,
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] mvebu: pinctrl: apply SDHCI PHY config for A7K
2022-07-25 12:13 [PATCH] mvebu: pinctrl: apply SDHCI PHY config for A7K Pali Rohár
@ 2022-07-28 6:33 ` Stefan Roese
2022-07-29 12:01 ` Stefan Roese
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2022-07-28 6:33 UTC (permalink / raw)
To: Pali Rohár; +Cc: u-boot
On 25.07.22 14:13, Pali Rohár wrote:
> From: Konstantin Porotchkin <kostap@marvell.com>
>
> 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.
>
> Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
> Reviewed-by: Igal Liberman <igall@marvell.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> drivers/pinctrl/mvebu/pinctrl-mvebu.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> index 536c6aff96e5..fd49a97b5b0a 100644
> --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> @@ -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
--
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: sr@denx.de
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mvebu: pinctrl: apply SDHCI PHY config for A7K
2022-07-25 12:13 [PATCH] mvebu: pinctrl: apply SDHCI PHY config for A7K Pali Rohár
2022-07-28 6:33 ` Stefan Roese
@ 2022-07-29 12:01 ` Stefan Roese
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2022-07-29 12:01 UTC (permalink / raw)
To: Pali Rohár; +Cc: u-boot
On 25.07.22 14:13, Pali Rohár wrote:
> From: Konstantin Porotchkin <kostap@marvell.com>
>
> 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.
>
> Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
> Reviewed-by: Igal Liberman <igall@marvell.com>
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> drivers/pinctrl/mvebu/pinctrl-mvebu.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> index 536c6aff96e5..fd49a97b5b0a 100644
> --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> @@ -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
--
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: sr@denx.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-29 12:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-25 12:13 [PATCH] mvebu: pinctrl: apply SDHCI PHY config for A7K Pali Rohár
2022-07-28 6:33 ` Stefan Roese
2022-07-29 12:01 ` Stefan Roese
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox