shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "clk: g12a: add gen clock [1/1]"" into odroidn2-4.9.y

Browse Source
This commit is contained in:
Mauro Ribeiro
2019-03-14 01:42:23 +09:00
committed by Gerrit Code Review
parent a11bceab27 d7eb7fe638
commit 0317819759
2 changed files with 2 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/amlogic/clk/g12a/g12a.c
View File

@@ -560,55 +560,6 @@ static struct clk_gate g12a_12m_gate = {
},
};
static u32 mux_table_gen_clk[] = { 0, 5, 6, 7, 20, 21, 22,
23, 24, 25, 26, 27, 28, };
static const char * const gen_clk_parent_names[] = {
"xtal", "gp0_pll", "gp1_pll", "hifi_pll", "fclk_div2", "fclk_div3",
"fclk_div4", "fclk_div5", "fclk_div7", "mpll0", "mpll1",
"mpll2", "mpll3"
};
static struct clk_mux g12a_gen_clk_sel = {
.reg = (void *)HHI_GEN_CLK_CNTL,
.mask = 0x1f,
.shift = 12,
.table = mux_table_gen_clk,
.lock = &clk_lock,
.hw.init = &(struct clk_init_data){
.name = "gen_clk_sel",
.ops = &clk_mux_ops,
.parent_names = gen_clk_parent_names,
.num_parents = ARRAY_SIZE(gen_clk_parent_names),
},
};
static struct clk_divider g12a_gen_clk_div = {
.reg = (void *)HHI_GEN_CLK_CNTL,
.shift = 0,
.width = 11,
.lock = &clk_lock,
.hw.init = &(struct clk_init_data){
.name = "gen_clk_div",
.ops = &clk_divider_ops,
.parent_names = (const char *[]){ "gen_clk_sel" },
.num_parents = 1,
.flags = CLK_SET_RATE_PARENT,
},
};
static struct clk_gate g12a_gen_clk = {
.reg = (void *)HHI_GEN_CLK_CNTL,
.bit_idx = 11,
.lock = &clk_lock,
.hw.init = &(struct clk_init_data){
.name = "gen_clk",
.ops = &clk_gate_ops,
.parent_names = (const char *[]){ "gen_clk_div" },
.num_parents = 1,
.flags = CLK_SET_RATE_PARENT,
},
};
/* Everything Else (EE) domain gates */
static struct clk_gate g12a_spicc_0 = {
@@ -801,10 +752,6 @@ static struct clk_hw *g12a_clk_hws[] = {
[CLKID_24M] = &g12a_24m.hw,
[CLKID_12M_DIV] = &g12a_12m_div.hw,
[CLKID_12M_GATE] = &g12a_12m_gate.hw,
[CLKID_GEN_CLK_SEL] = &g12a_gen_clk_sel.hw,
[CLKID_GEN_CLK_DIV] = &g12a_gen_clk_div.hw,
[CLKID_GEN_CLK] = &g12a_gen_clk.hw,
};
/* Convenience tables to populate base addresses in .probe */
@@ -891,7 +838,6 @@ static struct clk_gate *g12a_clk_gates[] = {
&g12a_efuse,
&g12a_24m,
&g12a_12m_gate,
&g12a_gen_clk,
};
static void __init g12a_clkc_init(struct device_node *np)
@@ -946,10 +892,7 @@ static void __init g12a_clkc_init(struct device_node *np)
g12a_12m_div.reg = clk_base
+ (unsigned long)g12a_12m_div.reg;
g12a_gen_clk_sel.reg = clk_base
+ (unsigned long)g12a_gen_clk_sel.reg;
g12a_gen_clk_div.reg = clk_base
+ (unsigned long)g12a_gen_clk_div.reg;
/* Populate base address for gates */
for (i = 0; i < ARRAY_SIZE(g12a_clk_gates); i++)
g12a_clk_gates[i]->reg = clk_base +

6
include/dt-bindings/clock/amlogic,g12a-clkc.h
View File

@@ -265,13 +265,9 @@
#define CLKID_24M (CLKID_MISC_BASE + 9)
#define CLKID_12M_DIV (CLKID_MISC_BASE + 10)
#define CLKID_12M_GATE (CLKID_MISC_BASE + 11)
/* gen clock */
#define CLKID_GEN_CLK_SEL (CLKID_MISC_BASE + 12)
#define CLKID_GEN_CLK_DIV (CLKID_MISC_BASE + 13)
#define CLKID_GEN_CLK (CLKID_MISC_BASE + 14)
/*G12B clk*/
#define CLKID_G12B_ADD_BASE (CLKID_MISC_BASE + 15)
#define CLKID_G12B_ADD_BASE (CLKID_MISC_BASE + 12)
#define CLKID_CPUB_FCLK_P (CLKID_G12B_ADD_BASE + 0)
#define CLKID_CPUB_CLK (CLKID_G12B_ADD_BASE + 1)
/*G12B gate*/