Commit 840e1a73 authored by Jerome Brunet's avatar Jerome Brunet

clk: meson: check pll rate param table before using it

Make sure the rate param table is available before using it.
Some read-only plls don't provide it, which is ok since the
table is not used by read-only clocks. R/W clocks are supposed
to provide it, but it does not hurt check it.
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
parent 7928b2cb
...@@ -94,6 +94,13 @@ static long meson_clk_pll_round_rate(struct clk_hw *hw, unsigned long rate, ...@@ -94,6 +94,13 @@ static long meson_clk_pll_round_rate(struct clk_hw *hw, unsigned long rate,
const struct pll_rate_table *rate_table = pll->rate_table; const struct pll_rate_table *rate_table = pll->rate_table;
int i; int i;
/*
* if the table is missing, just return the current rate
* since we don't have the other available frequencies
*/
if (!rate_table)
return meson_clk_pll_recalc_rate(hw, *parent_rate);
for (i = 0; i < pll->rate_count; i++) { for (i = 0; i < pll->rate_count; i++) {
if (rate <= rate_table[i].rate) if (rate <= rate_table[i].rate)
return rate_table[i].rate; return rate_table[i].rate;
...@@ -109,6 +116,9 @@ static const struct pll_rate_table *meson_clk_get_pll_settings(struct meson_clk_ ...@@ -109,6 +116,9 @@ static const struct pll_rate_table *meson_clk_get_pll_settings(struct meson_clk_
const struct pll_rate_table *rate_table = pll->rate_table; const struct pll_rate_table *rate_table = pll->rate_table;
int i; int i;
if (!rate_table)
return NULL;
for (i = 0; i < pll->rate_count; i++) { for (i = 0; i < pll->rate_count; i++) {
if (rate == rate_table[i].rate) if (rate == rate_table[i].rate)
return &rate_table[i]; return &rate_table[i];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment