From: Hans de Goede <[email protected]> For all pll-s on sun6i n == 0 means use a multiplier of 1, rather then 0 as it means on sun4i / sun5i / sun7i. n_start = 1 is already correctly set for sun6i pll6, but was missing for pll1, this commit fixes this.
Cc: Chen-Yu Tsai <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Signed-off-by: Chen-Yu Tsai <[email protected]> --- Upstream commit ID: 76820fcf7aa5a418b69cb7bed31b62d1feb1d6ad During the 3.20 window 2 versions of this patch were submitted separately by Hans and I, but this one, without the stable tags, was merged. I am resending the merged commit for inclusion in stable kernels 3.12 and up, as requested by Mike [1]. Commit 9a5e6c7eb5cc ("clk: sunxi: Support factor clocks with N factor starting not from 0") is also required for kernel versions before 3.16. Regards, ChenYu Tsai [1] http://www.spinics.net/lists/arm-kernel/msg395637.html --- drivers/clk/sunxi/clk-sunxi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index d43c7949a07c..9b79f8907cc5 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -584,6 +584,7 @@ static struct clk_factors_config sun6i_a31_pll1_config = { .kwidth = 2, .mshift = 0, .mwidth = 2, + .n_start = 1, }; static struct clk_factors_config sun8i_a23_pll1_config = { -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
