diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2017-04-04 18:35:51 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2017-04-12 18:07:46 +0200 |
| commit | f37753e2a361f0583c9999c571f1051699c19552 (patch) | |
| tree | ba8d91e3f9b8f146a477f513b8f593337ea890c8 | |
| parent | 4641d6a560f5088a983a55ea0075e363045631ca (diff) | |
| parent | ef18910479b7b4c5e8132f8a40a2a8176ef076f1 (diff) | |
| download | linux-stable-f37753e2a361f0583c9999c571f1051699c19552.tar.gz linux-stable-f37753e2a361f0583c9999c571f1051699c19552.tar.bz2 linux-stable-f37753e2a361f0583c9999c571f1051699c19552.zip | |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
clk: stm32f4: fix: exclude values 0 and 1 for PLLQ
| -rw-r--r-- | drivers/clk/clk-stm32f4.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c index ab609a76706f..cf9449b3dbd9 100644 --- a/drivers/clk/clk-stm32f4.c +++ b/drivers/clk/clk-stm32f4.c @@ -429,6 +429,13 @@ static const struct clk_div_table pll_divp_table[] = { { 0, 2 }, { 1, 4 }, { 2, 6 }, { 3, 8 }, { 0 } }; +static const struct clk_div_table pll_divq_table[] = { + { 2, 2 }, { 3, 3 }, { 4, 4 }, { 5, 5 }, { 6, 6 }, { 7, 7 }, + { 8, 8 }, { 9, 9 }, { 10, 10 }, { 11, 11 }, { 12, 12 }, { 13, 13 }, + { 14, 14 }, { 15, 15 }, + { 0 } +}; + static const struct clk_div_table pll_divr_table[] = { { 2, 2 }, { 3, 3 }, { 4, 4 }, { 5, 5 }, { 6, 6 }, { 7, 7 }, { 0 } }; @@ -496,9 +503,9 @@ struct stm32f4_div_data { #define MAX_PLL_DIV 3 static const struct stm32f4_div_data div_data[MAX_PLL_DIV] = { - { 16, 2, 0, pll_divp_table }, - { 24, 4, CLK_DIVIDER_ONE_BASED, NULL }, - { 28, 3, 0, pll_divr_table }, + { 16, 2, 0, pll_divp_table }, + { 24, 4, 0, pll_divq_table }, + { 28, 3, 0, pll_divr_table }, }; struct stm32f4_pll_data { |