Commit d77e8135 authored by Maxime Ripard's avatar Maxime Ripard

clk: sunxi-ng: multiplier: Add fractional support

Some clocks on the earlier SoCs such as the video PLLs are multipliers with
fractional settings.

Support those cases.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
parent d0f11d14
...@@ -75,6 +75,9 @@ static unsigned long ccu_mult_recalc_rate(struct clk_hw *hw, ...@@ -75,6 +75,9 @@ static unsigned long ccu_mult_recalc_rate(struct clk_hw *hw,
unsigned long val; unsigned long val;
u32 reg; u32 reg;
if (ccu_frac_helper_is_enabled(&cm->common, &cm->frac))
return ccu_frac_helper_read_rate(&cm->common, &cm->frac);
reg = readl(cm->common.base + cm->common.reg); reg = readl(cm->common.base + cm->common.reg);
val = reg >> cm->mult.shift; val = reg >> cm->mult.shift;
val &= (1 << cm->mult.width) - 1; val &= (1 << cm->mult.width) - 1;
...@@ -102,6 +105,11 @@ static int ccu_mult_set_rate(struct clk_hw *hw, unsigned long rate, ...@@ -102,6 +105,11 @@ static int ccu_mult_set_rate(struct clk_hw *hw, unsigned long rate,
unsigned long flags; unsigned long flags;
u32 reg; u32 reg;
if (ccu_frac_helper_has_rate(&cm->common, &cm->frac, rate))
return ccu_frac_helper_set_rate(&cm->common, &cm->frac, rate);
else
ccu_frac_helper_disable(&cm->common, &cm->frac);
ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1, ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1,
&parent_rate); &parent_rate);
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _CCU_MULT_H_ #define _CCU_MULT_H_
#include "ccu_common.h" #include "ccu_common.h"
#include "ccu_frac.h"
#include "ccu_mux.h" #include "ccu_mux.h"
struct ccu_mult_internal { struct ccu_mult_internal {
...@@ -23,6 +24,7 @@ struct ccu_mult_internal { ...@@ -23,6 +24,7 @@ struct ccu_mult_internal {
struct ccu_mult { struct ccu_mult {
u32 enable; u32 enable;
struct ccu_frac_internal frac;
struct ccu_mult_internal mult; struct ccu_mult_internal mult;
struct ccu_mux_internal mux; struct ccu_mux_internal mux;
struct ccu_common common; struct ccu_common common;
......
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