summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2016-07-26 15:04:25 +0800
committerMaxime Ripard <maxime.ripard@free-electrons.com>2016-08-08 20:03:20 +0200
commit178ca5312ad358fb129876bacbee8dac4681673a (patch)
tree3c179ffbc8f0e26e9bf6e757b85a0abdc85b364e
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
downloadblackbird-op-linux-178ca5312ad358fb129876bacbee8dac4681673a.tar.gz
blackbird-op-linux-178ca5312ad358fb129876bacbee8dac4681673a.zip
clk: sunxi-ng: mux: Increase fixed pre-divider div size
Some clocks have a predivider value that is larger than what u8 can store. One such example is the OUT clk found on A20/A31, which has a /750 pre-divider on one of the osc24M parents. Increase the size of the div field to u16. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r--drivers/clk/sunxi-ng/ccu_mux.c2
-rw-r--r--drivers/clk/sunxi-ng/ccu_mux.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c
index 58fc36e7dcce..1329b9ab481e 100644
--- a/drivers/clk/sunxi-ng/ccu_mux.c
+++ b/drivers/clk/sunxi-ng/ccu_mux.c
@@ -18,7 +18,7 @@ void ccu_mux_helper_adjust_parent_for_prediv(struct ccu_common *common,
int parent_index,
unsigned long *parent_rate)
{
- u8 prediv = 1;
+ u16 prediv = 1;
u32 reg;
if (!((common->features & CCU_FEATURE_FIXED_PREDIV) ||
diff --git a/drivers/clk/sunxi-ng/ccu_mux.h b/drivers/clk/sunxi-ng/ccu_mux.h
index 945082631e7d..d35ce5e93840 100644
--- a/drivers/clk/sunxi-ng/ccu_mux.h
+++ b/drivers/clk/sunxi-ng/ccu_mux.h
@@ -11,7 +11,7 @@ struct ccu_mux_internal {
struct {
u8 index;
- u8 div;
+ u16 div;
} fixed_prediv;
struct {
OpenPOWER on IntegriCloud