clk: sunxi-ng: multiplier: Add fractional support
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Thu, 13 Oct 2016 10:44:55 +0000 (12:44 +0200)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 23 Jan 2017 10:44:26 +0000 (11:44 +0100)
Some clocks on the earlier SoCs such as the video PLLs are multipliers with
fractional settings.

Support those cases.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
drivers/clk/sunxi-ng/ccu_mult.c
drivers/clk/sunxi-ng/ccu_mult.h

index 678b6cb49f01b7b176ca84f425ee5a91d6486728..826302464650611aebb4a9e6b1afed677a148825 100644 (file)
@@ -75,6 +75,9 @@ static unsigned long ccu_mult_recalc_rate(struct clk_hw *hw,
        unsigned long val;
        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);
        val = reg >> cm->mult.shift;
        val &= (1 << cm->mult.width) - 1;
@@ -102,6 +105,11 @@ static int ccu_mult_set_rate(struct clk_hw *hw, unsigned long rate,
        unsigned long flags;
        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,
                                                &parent_rate);
 
index c1a2134bdc711367d239b237f5dae01f1e6af07b..bd2e38b5a32a934e35c92d88181f7364895dcaca 100644 (file)
@@ -2,6 +2,7 @@
 #define _CCU_MULT_H_
 
 #include "ccu_common.h"
+#include "ccu_frac.h"
 #include "ccu_mux.h"
 
 struct ccu_mult_internal {
@@ -23,6 +24,7 @@ struct ccu_mult_internal {
 struct ccu_mult {
        u32                     enable;
 
+       struct ccu_frac_internal        frac;
        struct ccu_mult_internal        mult;
        struct ccu_mux_internal mux;
        struct ccu_common       common;