Skip to content

Commit

Permalink
clk: sunxi-ng: mux: support fixed pre-dividers on multiple parents
Browse files Browse the repository at this point in the history
Some clocks on the A31 have fixed pre-dividers on multiple parents.
Add support for them.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  • Loading branch information
Chen-Yu Tsai authored and Maxime Ripard committed Aug 25, 2016
1 parent 2b9c875 commit ff5294d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
10 changes: 5 additions & 5 deletions drivers/clk/sunxi-ng/ccu-sun8i-h3.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,15 @@ static SUNXI_CCU_MP_WITH_MUX(apb2_clk, "apb2", apb2_parents, 0x058,
0);

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 = {
.mux = {
.shift = 0,
.width = 1,

.fixed_prediv = {
.index = 1,
.div = 2,
},
.fixed_predivs = ahb2_fixed_predivs,
.n_predivs = ARRAY_SIZE(ahb2_fixed_predivs),
},

.common = {
Expand Down
6 changes: 4 additions & 2 deletions drivers/clk/sunxi-ng/ccu_mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ void ccu_mux_helper_adjust_parent_for_prediv(struct ccu_common *common,
{
u16 prediv = 1;
u32 reg;
int i;

if (!((common->features & CCU_FEATURE_FIXED_PREDIV) ||
(common->features & CCU_FEATURE_VARIABLE_PREDIV)))
Expand All @@ -32,8 +33,9 @@ void ccu_mux_helper_adjust_parent_for_prediv(struct ccu_common *common,
}

if (common->features & CCU_FEATURE_FIXED_PREDIV)
if (parent_index == cm->fixed_prediv.index)
prediv = cm->fixed_prediv.div;
for (i = 0; i < cm->n_predivs; i++)
if (parent_index == cm->fixed_predivs[i].index)
prediv = cm->fixed_predivs[i].div;

if (common->features & CCU_FEATURE_VARIABLE_PREDIV)
if (parent_index == cm->variable_prediv.index) {
Expand Down
11 changes: 7 additions & 4 deletions drivers/clk/sunxi-ng/ccu_mux.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@

#include "ccu_common.h"

struct ccu_mux_fixed_prediv {
u8 index;
u16 div;
};

struct ccu_mux_internal {
u8 shift;
u8 width;
const u8 *table;

struct {
u8 index;
u16 div;
} fixed_prediv;
const struct ccu_mux_fixed_prediv *fixed_predivs;
u8 n_predivs;

struct {
u8 index;
Expand Down

0 comments on commit ff5294d

Please sign in to comment.