projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5f9e832
)
clk: ingenic/jz4740: Fix "pll half" divider not read/written properly
author
Paul Cercueil
<paul@crapouillou.net>
Mon, 1 Jul 2019 11:36:06 +0000
(13:36 +0200)
committer
Stephen Boyd
<sboyd@kernel.org>
Wed, 7 Aug 2019 21:33:39 +0000
(14:33 -0700)
The code was setting the bit 21 of the CPCCR register to use a divider
of 2 for the "pll half" clock, and clearing the bit to use a divider
of 1.
This is the opposite of how this register field works: a cleared bit
means that the /2 divider is used, and a set bit means that the divider
is 1.
Restore the correct behaviour using the newly introduced .div_table
field.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link:
https://lkml.kernel.org/r/20190701113606.4130-1-paul@crapouillou.net
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/ingenic/jz4740-cgu.c
patch
|
blob
|
history
diff --git
a/drivers/clk/ingenic/jz4740-cgu.c
b/drivers/clk/ingenic/jz4740-cgu.c
index 4c0a20949c2c2785978b6b4d04f990b661c861c2..9b27d75d9485c17ecbf8584923aa4aef04878305 100644
(file)
--- a/
drivers/clk/ingenic/jz4740-cgu.c
+++ b/
drivers/clk/ingenic/jz4740-cgu.c
@@
-53,6
+53,10
@@
static const u8 jz4740_cgu_cpccr_div_table[] = {
1, 2, 3, 4, 6, 8, 12, 16, 24, 32,
};
+static const u8 jz4740_cgu_pll_half_div_table[] = {
+ 2, 1,
+};
+
static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
/* External clocks */
@@
-86,7
+90,10
@@
static const struct ingenic_cgu_clk_info jz4740_cgu_clocks[] = {
[JZ4740_CLK_PLL_HALF] = {
"pll half", CGU_CLK_DIV,
.parents = { JZ4740_CLK_PLL, -1, -1, -1 },
- .div = { CGU_REG_CPCCR, 21, 1, 1, -1, -1, -1 },
+ .div = {
+ CGU_REG_CPCCR, 21, 1, 1, -1, -1, -1,
+ jz4740_cgu_pll_half_div_table,
+ },
},
[JZ4740_CLK_CCLK] = {