mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
Merge branch 'v5.5/fixes' into v5.6/drivers
This commit is contained in:
commit
c97fcd8546
2 changed files with 10 additions and 0 deletions
|
@ -77,6 +77,15 @@ static unsigned long meson_clk_pll_recalc_rate(struct clk_hw *hw,
|
||||||
unsigned int m, n, frac;
|
unsigned int m, n, frac;
|
||||||
|
|
||||||
n = meson_parm_read(clk->map, &pll->n);
|
n = meson_parm_read(clk->map, &pll->n);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* On some HW, N is set to zero on init. This value is invalid as
|
||||||
|
* it would result in a division by zero. The rate can't be
|
||||||
|
* calculated in this case
|
||||||
|
*/
|
||||||
|
if (n == 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
m = meson_parm_read(clk->map, &pll->m);
|
m = meson_parm_read(clk->map, &pll->m);
|
||||||
|
|
||||||
frac = MESON_PARM_APPLICABLE(&pll->frac) ?
|
frac = MESON_PARM_APPLICABLE(&pll->frac) ?
|
||||||
|
|
|
@ -4692,6 +4692,7 @@ static struct clk_regmap *const g12a_clk_regmaps[] = {
|
||||||
&g12a_bt656,
|
&g12a_bt656,
|
||||||
&g12a_usb1_to_ddr,
|
&g12a_usb1_to_ddr,
|
||||||
&g12a_mmc_pclk,
|
&g12a_mmc_pclk,
|
||||||
|
&g12a_uart2,
|
||||||
&g12a_vpu_intr,
|
&g12a_vpu_intr,
|
||||||
&g12a_gic,
|
&g12a_gic,
|
||||||
&g12a_sd_emmc_a_clk0,
|
&g12a_sd_emmc_a_clk0,
|
||||||
|
|
Loading…
Reference in a new issue