* [PATCH] clk: meson: g12a: add missing SD_EMMC_A controller gates
@ 2020-04-20 13:46 ` Neil Armstrong
0 siblings, 0 replies; 4+ messages in thread
From: Neil Armstrong @ 2020-04-20 13:46 UTC (permalink / raw)
To: u-boot
Add missing SD_EMMC_A controller gates needed for probe of the A
controller, otherwise leading to a freeze of the SoC after b3d69aa596.
Fixes: b3d69aa596 ("clk: meson: reset mmc clock on probe")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/clk/meson/g12a.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index c1976aa1ef..6089f8474e 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -112,6 +112,7 @@ static struct meson_gate gates[NUM_CLKS] = {
MESON_GATE(CLKID_I2C, HHI_GCLK_MPEG0, 9),
MESON_GATE(CLKID_UART0, HHI_GCLK_MPEG0, 13),
MESON_GATE(CLKID_SPICC1, HHI_GCLK_MPEG0, 14),
+ MESON_GATE(CLKID_SD_EMMC_A, HHI_GCLK_MPEG0, 4),
MESON_GATE(CLKID_SD_EMMC_B, HHI_GCLK_MPEG0, 25),
MESON_GATE(CLKID_SD_EMMC_C, HHI_GCLK_MPEG0, 26),
MESON_GATE(CLKID_ETH, HHI_GCLK_MPEG1, 3),
@@ -127,6 +128,7 @@ static struct meson_gate gates[NUM_CLKS] = {
MESON_GATE(CLKID_FCLK_DIV4, HHI_FIX_PLL_CNTL1, 21),
MESON_GATE(CLKID_FCLK_DIV5, HHI_FIX_PLL_CNTL1, 22),
MESON_GATE(CLKID_FCLK_DIV7, HHI_FIX_PLL_CNTL1, 23),
+ MESON_GATE(CLKID_SD_EMMC_A_CLK0, HHI_SD_EMMC_CLK_CNTL, 7),
MESON_GATE(CLKID_SD_EMMC_B_CLK0, HHI_SD_EMMC_CLK_CNTL, 23),
MESON_GATE(CLKID_SD_EMMC_C_CLK0, HHI_NAND_CLK_CNTL, 7),
MESON_GATE(CLKID_VPU_0, HHI_VPU_CLK_CNTL, 8),
--
2.22.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] clk: meson: g12a: add missing SD_EMMC_A controller gates
@ 2020-04-20 13:46 ` Neil Armstrong
0 siblings, 0 replies; 4+ messages in thread
From: Neil Armstrong @ 2020-04-20 13:46 UTC (permalink / raw)
To: u-boot-amlogic; +Cc: u-boot, Neil Armstrong
Add missing SD_EMMC_A controller gates needed for probe of the A
controller, otherwise leading to a freeze of the SoC after b3d69aa596.
Fixes: b3d69aa596 ("clk: meson: reset mmc clock on probe")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/clk/meson/g12a.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index c1976aa1ef..6089f8474e 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -112,6 +112,7 @@ static struct meson_gate gates[NUM_CLKS] = {
MESON_GATE(CLKID_I2C, HHI_GCLK_MPEG0, 9),
MESON_GATE(CLKID_UART0, HHI_GCLK_MPEG0, 13),
MESON_GATE(CLKID_SPICC1, HHI_GCLK_MPEG0, 14),
+ MESON_GATE(CLKID_SD_EMMC_A, HHI_GCLK_MPEG0, 4),
MESON_GATE(CLKID_SD_EMMC_B, HHI_GCLK_MPEG0, 25),
MESON_GATE(CLKID_SD_EMMC_C, HHI_GCLK_MPEG0, 26),
MESON_GATE(CLKID_ETH, HHI_GCLK_MPEG1, 3),
@@ -127,6 +128,7 @@ static struct meson_gate gates[NUM_CLKS] = {
MESON_GATE(CLKID_FCLK_DIV4, HHI_FIX_PLL_CNTL1, 21),
MESON_GATE(CLKID_FCLK_DIV5, HHI_FIX_PLL_CNTL1, 22),
MESON_GATE(CLKID_FCLK_DIV7, HHI_FIX_PLL_CNTL1, 23),
+ MESON_GATE(CLKID_SD_EMMC_A_CLK0, HHI_SD_EMMC_CLK_CNTL, 7),
MESON_GATE(CLKID_SD_EMMC_B_CLK0, HHI_SD_EMMC_CLK_CNTL, 23),
MESON_GATE(CLKID_SD_EMMC_C_CLK0, HHI_NAND_CLK_CNTL, 7),
MESON_GATE(CLKID_VPU_0, HHI_VPU_CLK_CNTL, 8),
--
2.22.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] clk: meson: g12a: add missing SD_EMMC_A controller gates
2020-04-20 13:46 ` Neil Armstrong
@ 2020-04-21 11:52 ` Neil Armstrong
-1 siblings, 0 replies; 4+ messages in thread
From: Neil Armstrong @ 2020-04-21 11:52 UTC (permalink / raw)
To: u-boot
On 20/04/2020 15:46, Neil Armstrong wrote:
> Add missing SD_EMMC_A controller gates needed for probe of the A
> controller, otherwise leading to a freeze of the SoC after b3d69aa596.
>
> Fixes: b3d69aa596 ("clk: meson: reset mmc clock on probe")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> drivers/clk/meson/g12a.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
> index c1976aa1ef..6089f8474e 100644
> --- a/drivers/clk/meson/g12a.c
> +++ b/drivers/clk/meson/g12a.c
> @@ -112,6 +112,7 @@ static struct meson_gate gates[NUM_CLKS] = {
> MESON_GATE(CLKID_I2C, HHI_GCLK_MPEG0, 9),
> MESON_GATE(CLKID_UART0, HHI_GCLK_MPEG0, 13),
> MESON_GATE(CLKID_SPICC1, HHI_GCLK_MPEG0, 14),
> + MESON_GATE(CLKID_SD_EMMC_A, HHI_GCLK_MPEG0, 4),
> MESON_GATE(CLKID_SD_EMMC_B, HHI_GCLK_MPEG0, 25),
> MESON_GATE(CLKID_SD_EMMC_C, HHI_GCLK_MPEG0, 26),
> MESON_GATE(CLKID_ETH, HHI_GCLK_MPEG1, 3),
> @@ -127,6 +128,7 @@ static struct meson_gate gates[NUM_CLKS] = {
> MESON_GATE(CLKID_FCLK_DIV4, HHI_FIX_PLL_CNTL1, 21),
> MESON_GATE(CLKID_FCLK_DIV5, HHI_FIX_PLL_CNTL1, 22),
> MESON_GATE(CLKID_FCLK_DIV7, HHI_FIX_PLL_CNTL1, 23),
> + MESON_GATE(CLKID_SD_EMMC_A_CLK0, HHI_SD_EMMC_CLK_CNTL, 7),
> MESON_GATE(CLKID_SD_EMMC_B_CLK0, HHI_SD_EMMC_CLK_CNTL, 23),
> MESON_GATE(CLKID_SD_EMMC_C_CLK0, HHI_NAND_CLK_CNTL, 7),
> MESON_GATE(CLKID_VPU_0, HHI_VPU_CLK_CNTL, 8),
>
Applied to u-boot-amlogic
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] clk: meson: g12a: add missing SD_EMMC_A controller gates
@ 2020-04-21 11:52 ` Neil Armstrong
0 siblings, 0 replies; 4+ messages in thread
From: Neil Armstrong @ 2020-04-21 11:52 UTC (permalink / raw)
To: u-boot-amlogic; +Cc: u-boot
On 20/04/2020 15:46, Neil Armstrong wrote:
> Add missing SD_EMMC_A controller gates needed for probe of the A
> controller, otherwise leading to a freeze of the SoC after b3d69aa596.
>
> Fixes: b3d69aa596 ("clk: meson: reset mmc clock on probe")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> drivers/clk/meson/g12a.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
> index c1976aa1ef..6089f8474e 100644
> --- a/drivers/clk/meson/g12a.c
> +++ b/drivers/clk/meson/g12a.c
> @@ -112,6 +112,7 @@ static struct meson_gate gates[NUM_CLKS] = {
> MESON_GATE(CLKID_I2C, HHI_GCLK_MPEG0, 9),
> MESON_GATE(CLKID_UART0, HHI_GCLK_MPEG0, 13),
> MESON_GATE(CLKID_SPICC1, HHI_GCLK_MPEG0, 14),
> + MESON_GATE(CLKID_SD_EMMC_A, HHI_GCLK_MPEG0, 4),
> MESON_GATE(CLKID_SD_EMMC_B, HHI_GCLK_MPEG0, 25),
> MESON_GATE(CLKID_SD_EMMC_C, HHI_GCLK_MPEG0, 26),
> MESON_GATE(CLKID_ETH, HHI_GCLK_MPEG1, 3),
> @@ -127,6 +128,7 @@ static struct meson_gate gates[NUM_CLKS] = {
> MESON_GATE(CLKID_FCLK_DIV4, HHI_FIX_PLL_CNTL1, 21),
> MESON_GATE(CLKID_FCLK_DIV5, HHI_FIX_PLL_CNTL1, 22),
> MESON_GATE(CLKID_FCLK_DIV7, HHI_FIX_PLL_CNTL1, 23),
> + MESON_GATE(CLKID_SD_EMMC_A_CLK0, HHI_SD_EMMC_CLK_CNTL, 7),
> MESON_GATE(CLKID_SD_EMMC_B_CLK0, HHI_SD_EMMC_CLK_CNTL, 23),
> MESON_GATE(CLKID_SD_EMMC_C_CLK0, HHI_NAND_CLK_CNTL, 7),
> MESON_GATE(CLKID_VPU_0, HHI_VPU_CLK_CNTL, 8),
>
Applied to u-boot-amlogic
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-21 11:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-20 13:46 [PATCH] clk: meson: g12a: add missing SD_EMMC_A controller gates Neil Armstrong
2020-04-20 13:46 ` Neil Armstrong
2020-04-21 11:52 ` Neil Armstrong
2020-04-21 11:52 ` Neil Armstrong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.