projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c99c7a9
)
clk: Loongson1: Make use of GENMASK
author
Kelvin Cheung
<keguang.zhang@gmail.com>
Mon, 19 Sep 2016 04:38:56 +0000
(12:38 +0800)
committer
Stephen Boyd
<sboyd@codeaurora.org>
Fri, 23 Sep 2016 21:49:06 +0000
(14:49 -0700)
Make use of GENMASK instead of open coding the equivalent operation,
and update the PLL formula.
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/loongson1/clk-loongson1b.c
patch
|
blob
|
history
diff --git
a/drivers/clk/loongson1/clk-loongson1b.c
b/drivers/clk/loongson1/clk-loongson1b.c
index 4b3d9d2983ee4c155a14dfb0be569e03b1adcbd2..f36a97e993c069c2a5344d82231e26f3fd21ff97 100644
(file)
--- a/
drivers/clk/loongson1/clk-loongson1b.c
+++ b/
drivers/clk/loongson1/clk-loongson1b.c
@@
-26,7
+26,7
@@
static unsigned long ls1x_pll_recalc_rate(struct clk_hw *hw,
u32 pll, rate;
pll = __raw_readl(LS1X_CLK_PLL_FREQ);
- rate = 12 + (pll &
0x3f) + (((pll >> 8) & 0x3ff) >> 10
);
+ rate = 12 + (pll &
GENMASK(5, 0)
);
rate *= OSC;
rate >>= 1;