diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-08 08:48:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-08 08:48:31 -0400 |
| commit | 1ebf50d9bb3ae844cc05b7e720e7a34ab53557c8 (patch) | |
| tree | 4d78dda7de1c24325ac7418d06230f2728eb75e3 /drivers/clk/meson/g12a.c | |
| parent | 1f47e2aca42c2e51ff3a7754c717ee13f568c721 (diff) | |
| parent | e13e7c9daec54f387468098aa1f857e99a1333ec (diff) | |
| download | u-boot-1ebf50d9bb3ae844cc05b7e720e7a34ab53557c8.tar.gz | |
Merge tag 'u-boot-amlogic-20200406' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic into nextWIP/08Apr2020-next
- clk: meson-g12a: missing break
- sync all Amlogic DT from Linux v5.6-rc2
- MMC clock fixups
- add support for Libre Computer AML-S905D-PC and AML-S912-PC
Diffstat (limited to 'drivers/clk/meson/g12a.c')
| -rw-r--r-- | drivers/clk/meson/g12a.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index 686d94ebfe..c1976aa1ef 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -804,6 +804,7 @@ static ulong meson_clk_get_rate_by_id(struct clk *clk, unsigned long id) break; case CLKID_PCIE_PLL: rate = meson_pcie_pll_get_rate(clk); + break; case CLKID_VPU_0: rate = meson_div_get_rate(clk, CLKID_VPU_0_DIV); break; @@ -977,6 +978,13 @@ static int meson_clk_probe(struct udevice *dev) if (IS_ERR(priv->map)) return PTR_ERR(priv->map); + /* + * Depending on the boot src, the state of the MMC clock might + * be different. Reset it to make sure we won't get stuck + */ + regmap_write(priv->map, HHI_NAND_CLK_CNTL, 0); + regmap_write(priv->map, HHI_SD_EMMC_CLK_CNTL, 0); + debug("meson-clk-g12a: probed\n"); return 0; |