Commit ff5294db authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard

clk: sunxi-ng: mux: support fixed pre-dividers on multiple parents

Some clocks on the A31 have fixed pre-dividers on multiple parents.
Add support for them.
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 2b9c875c
...@@ -184,15 +184,15 @@ static SUNXI_CCU_MP_WITH_MUX(apb2_clk, "apb2", apb2_parents, 0x058, ...@@ -184,15 +184,15 @@ static SUNXI_CCU_MP_WITH_MUX(apb2_clk, "apb2", apb2_parents, 0x058,
0); 0);
static const char * const ahb2_parents[] = { "ahb1" , "pll-periph0" }; static const char * const ahb2_parents[] = { "ahb1" , "pll-periph0" };
static const struct ccu_mux_fixed_prediv ahb2_fixed_predivs[] = {
{ .index = 1, .div = 2 },
};
static struct ccu_mux ahb2_clk = { static struct ccu_mux ahb2_clk = {
.mux = { .mux = {
.shift = 0, .shift = 0,
.width = 1, .width = 1,
.fixed_predivs = ahb2_fixed_predivs,
.fixed_prediv = { .n_predivs = ARRAY_SIZE(ahb2_fixed_predivs),
.index = 1,
.div = 2,
},
}, },
.common = { .common = {
......
...@@ -20,6 +20,7 @@ void ccu_mux_helper_adjust_parent_for_prediv(struct ccu_common *common, ...@@ -20,6 +20,7 @@ void ccu_mux_helper_adjust_parent_for_prediv(struct ccu_common *common,
{ {
u16 prediv = 1; u16 prediv = 1;
u32 reg; u32 reg;
int i;
if (!((common->features & CCU_FEATURE_FIXED_PREDIV) || if (!((common->features & CCU_FEATURE_FIXED_PREDIV) ||
(common->features & CCU_FEATURE_VARIABLE_PREDIV))) (common->features & CCU_FEATURE_VARIABLE_PREDIV)))
...@@ -32,8 +33,9 @@ void ccu_mux_helper_adjust_parent_for_prediv(struct ccu_common *common, ...@@ -32,8 +33,9 @@ void ccu_mux_helper_adjust_parent_for_prediv(struct ccu_common *common,
} }
if (common->features & CCU_FEATURE_FIXED_PREDIV) if (common->features & CCU_FEATURE_FIXED_PREDIV)
if (parent_index == cm->fixed_prediv.index) for (i = 0; i < cm->n_predivs; i++)
prediv = cm->fixed_prediv.div; if (parent_index == cm->fixed_predivs[i].index)
prediv = cm->fixed_predivs[i].div;
if (common->features & CCU_FEATURE_VARIABLE_PREDIV) if (common->features & CCU_FEATURE_VARIABLE_PREDIV)
if (parent_index == cm->variable_prediv.index) { if (parent_index == cm->variable_prediv.index) {
......
...@@ -5,15 +5,18 @@ ...@@ -5,15 +5,18 @@
#include "ccu_common.h" #include "ccu_common.h"
struct ccu_mux_fixed_prediv {
u8 index;
u16 div;
};
struct ccu_mux_internal { struct ccu_mux_internal {
u8 shift; u8 shift;
u8 width; u8 width;
const u8 *table; const u8 *table;
struct { const struct ccu_mux_fixed_prediv *fixed_predivs;
u8 index; u8 n_predivs;
u16 div;
} fixed_prediv;
struct { struct {
u8 index; u8 index;
......
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