renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-26 07:35:44 +08:00
Code

clk: sunxi-ng: mux: Add support for mux tables

Browse Source 
Some clock muxes have holes, i.e. invalid or unconnected inputs,
between parent mux values.

Add support for specifying a mux table to map clock parents to
mux values.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Chen-Yu Tsai 2016-08-25 14:21:56 +08:00 committed by Maxime Ripard
parent 89af85253c
commit 2b9c875c56
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/clk/sunxi-ng/ccu_mux.c
View File

@ -107,6 +107,15 @@ u8 ccu_mux_helper_get_parent(struct ccu_common *common,
parent = reg >> cm->shift; parent = reg >> cm->shift;
parent &= (1 << cm->width) - 1; parent &= (1 << cm->width) - 1;
if (cm->table) {
int num_parents = clk_hw_get_num_parents(&common->hw);
int i;
for (i = 0; i < num_parents; i++)
if (cm->table[i] == parent)
return i;
}
return parent; return parent;
} }
@ -117,6 +126,9 @@ int ccu_mux_helper_set_parent(struct ccu_common *common,
unsigned long flags; unsigned long flags;
u32 reg; u32 reg;
if (cm->table)
index = cm->table[index];
spin_lock_irqsave(common->lock, flags); spin_lock_irqsave(common->lock, flags);
reg = readl(common->base + common->reg); reg = readl(common->base + common->reg);

17
drivers/clk/sunxi-ng/ccu_mux.h
View File

@ -6,8 +6,9 @@
#include "ccu_common.h" #include "ccu_common.h"
struct ccu_mux_internal { struct ccu_mux_internal {
u8 shift; u8 shift;
u8 width; u8 width;
const u8 *table;
struct { struct {
u8 index; u8 index;
@ -21,12 +22,16 @@ struct ccu_mux_internal {
} variable_prediv; } variable_prediv;
}; };
#define _SUNXI_CCU_MUX(_shift, _width) \ #define _SUNXI_CCU_MUX_TABLE(_shift, _width, _table) \
{ \ { \
.shift = _shift, \ .shift = _shift, \
.width = _width, \ .width = _width, \
.table = _table, \
} }
#define _SUNXI_CCU_MUX(_shift, _width) \
_SUNXI_CCU_MUX_TABLE(_shift, _width, NULL)
struct ccu_mux { struct ccu_mux {
u16 reg; u16 reg;
u32 enable; u32 enable;