diff mbox series

clk: meson: g12a: add missing SD_EMMC_A controller gates

Message ID 20200420134630.19935-1-narmstrong@baylibre.com
State Accepted
Commit 75dcc2d484b3174547e13fa4d3cb7f557b5a0b37
Headers show
Series clk: meson: g12a: add missing SD_EMMC_A controller gates | expand

Commit Message

Neil Armstrong April 20, 2020, 1:46 p.m. UTC
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 at baylibre.com>
---
 drivers/clk/meson/g12a.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Neil Armstrong April 21, 2020, 11:52 a.m. UTC | #1
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 at 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
diff mbox series

Patch

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),