Commit eb662f85 authored by Maxime Ripard's avatar Maxime Ripard

clk: sunxi: pll2: Add A13 support

The A13, unlike the A10 and A20, doesn't use a pass-through exception for
the 0 value in the pre and post dividers, but increments all the values
written in the register by one.

Add an exception for both these cases to handle them nicely.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
parent 460d0d44
...@@ -41,9 +41,15 @@ ...@@ -41,9 +41,15 @@
#define SUN4I_PLL2_OUTPUTS 4 #define SUN4I_PLL2_OUTPUTS 4
struct sun4i_pll2_data {
u32 post_div_offset;
u32 pre_div_flags;
};
static DEFINE_SPINLOCK(sun4i_a10_pll2_lock); static DEFINE_SPINLOCK(sun4i_a10_pll2_lock);
static void __init sun4i_pll2_setup(struct device_node *node) static void __init sun4i_pll2_setup(struct device_node *node,
struct sun4i_pll2_data *data)
{ {
const char *clk_name = node->name, *parent; const char *clk_name = node->name, *parent;
struct clk **clks, *base_clk, *prediv_clk; struct clk **clks, *base_clk, *prediv_clk;
...@@ -70,8 +76,7 @@ static void __init sun4i_pll2_setup(struct device_node *node) ...@@ -70,8 +76,7 @@ static void __init sun4i_pll2_setup(struct device_node *node)
parent, 0, reg, parent, 0, reg,
SUN4I_PLL2_PRE_DIV_SHIFT, SUN4I_PLL2_PRE_DIV_SHIFT,
SUN4I_PLL2_PRE_DIV_WIDTH, SUN4I_PLL2_PRE_DIV_WIDTH,
CLK_DIVIDER_ONE_BASED | data->pre_div_flags,
CLK_DIVIDER_ALLOW_ZERO,
&sun4i_a10_pll2_lock); &sun4i_a10_pll2_lock);
if (!prediv_clk) { if (!prediv_clk) {
pr_err("Couldn't register the prediv clock\n"); pr_err("Couldn't register the prediv clock\n");
...@@ -122,7 +127,7 @@ static void __init sun4i_pll2_setup(struct device_node *node) ...@@ -122,7 +127,7 @@ static void __init sun4i_pll2_setup(struct device_node *node)
*/ */
val = readl(reg); val = readl(reg);
val &= ~(SUN4I_PLL2_POST_DIV_MASK << SUN4I_PLL2_POST_DIV_SHIFT); val &= ~(SUN4I_PLL2_POST_DIV_MASK << SUN4I_PLL2_POST_DIV_SHIFT);
val |= SUN4I_PLL2_POST_DIV_VALUE << SUN4I_PLL2_POST_DIV_SHIFT; val |= (SUN4I_PLL2_POST_DIV_VALUE - data->post_div_offset) << SUN4I_PLL2_POST_DIV_SHIFT;
writel(val, reg); writel(val, reg);
of_property_read_string_index(node, "clock-output-names", of_property_read_string_index(node, "clock-output-names",
...@@ -185,4 +190,27 @@ static void __init sun4i_pll2_setup(struct device_node *node) ...@@ -185,4 +190,27 @@ static void __init sun4i_pll2_setup(struct device_node *node)
err_unmap: err_unmap:
iounmap(reg); iounmap(reg);
} }
CLK_OF_DECLARE(sun4i_pll2, "allwinner,sun4i-a10-pll2-clk", sun4i_pll2_setup);
static struct sun4i_pll2_data sun4i_a10_pll2_data = {
.pre_div_flags = CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO,
};
static void __init sun4i_a10_pll2_setup(struct device_node *node)
{
sun4i_pll2_setup(node, &sun4i_a10_pll2_data);
}
CLK_OF_DECLARE(sun4i_a10_pll2, "allwinner,sun4i-a10-pll2-clk",
sun4i_a10_pll2_setup);
static struct sun4i_pll2_data sun5i_a13_pll2_data = {
.post_div_offset = 1,
};
static void __init sun5i_a13_pll2_setup(struct device_node *node)
{
sun4i_pll2_setup(node, &sun5i_a13_pll2_data);
}
CLK_OF_DECLARE(sun5i_a13_pll2, "allwinner,sun5i-a13-pll2-clk",
sun5i_a13_pll2_setup);
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