Skip to content

L
linux
Commit 9e48f051 authored by Iskren Chernev's avatar Iskren Chernev Committed by Bjorn Andersson
Browse files
Options

clk: qcom: Merge alt alpha plls for qcm2260, sm6115 

The qcom2260 and sm6115 GCC drivers use a common modified DEFAULT and
BRAMMO alpha pll offsets. Move these common offsets to the shared place
to avoid duplication. The new layouts have a suffix EVO similar to LUCID
and RIVIAN.
Signed-off-by: default avatarIskren Chernev <iskren.chernev@gmail.com>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220830075620.974009-4-iskren.chernev@gmail.com
parent 65f1fa35
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 82 deletions
drivers/clk/qcom/clk-alpha-pll.c
View file @ 9e48f051
...@@ -166,6 +166,27 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = { ...@@ -166,6 +166,27 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = {
[PLL_OFF_TEST_CTL] = 0x28, [PLL_OFF_TEST_CTL] = 0x28,
[PLL_OFF_TEST_CTL_U] = 0x2c, [PLL_OFF_TEST_CTL_U] = 0x2c,
}, },
[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO] = {
[PLL_OFF_L_VAL] = 0x04,
[PLL_OFF_ALPHA_VAL] = 0x08,
[PLL_OFF_ALPHA_VAL_U] = 0x0c,
[PLL_OFF_TEST_CTL] = 0x10,
[PLL_OFF_TEST_CTL_U] = 0x14,
[PLL_OFF_USER_CTL] = 0x18,
[PLL_OFF_USER_CTL_U] = 0x1c,
[PLL_OFF_CONFIG_CTL] = 0x20,
[PLL_OFF_STATUS] = 0x24,
},
[CLK_ALPHA_PLL_TYPE_BRAMMO_EVO] = {
[PLL_OFF_L_VAL] = 0x04,
[PLL_OFF_ALPHA_VAL] = 0x08,
[PLL_OFF_ALPHA_VAL_U] = 0x0c,
[PLL_OFF_TEST_CTL] = 0x10,
[PLL_OFF_TEST_CTL_U] = 0x14,
[PLL_OFF_USER_CTL] = 0x18,
[PLL_OFF_CONFIG_CTL] = 0x1C,
[PLL_OFF_STATUS] = 0x20,
},
}; };
EXPORT_SYMBOL_GPL(clk_alpha_pll_regs); EXPORT_SYMBOL_GPL(clk_alpha_pll_regs);
......
drivers/clk/qcom/clk-alpha-pll.h
View file @ 9e48f051
...@@ -19,6 +19,8 @@ enum { ...@@ -19,6 +19,8 @@ enum {
CLK_ALPHA_PLL_TYPE_ZONDA, CLK_ALPHA_PLL_TYPE_ZONDA,
CLK_ALPHA_PLL_TYPE_LUCID_EVO, CLK_ALPHA_PLL_TYPE_LUCID_EVO,
CLK_ALPHA_PLL_TYPE_RIVIAN_EVO, CLK_ALPHA_PLL_TYPE_RIVIAN_EVO,
CLK_ALPHA_PLL_TYPE_DEFAULT_EVO,
CLK_ALPHA_PLL_TYPE_BRAMMO_EVO,
CLK_ALPHA_PLL_TYPE_MAX, CLK_ALPHA_PLL_TYPE_MAX,
}; };
......
drivers/clk/qcom/gcc-qcm2290.c
View file @ 9e48f051
...@@ -54,33 +54,9 @@ static const struct pll_vco spark_vco[] = { ...@@ -54,33 +54,9 @@ static const struct pll_vco spark_vco[] = {
{ 750000000, 1500000000, 1 }, { 750000000, 1500000000, 1 },
}; };
static const u8 clk_alpha_pll_regs_offset[][PLL_OFF_MAX_REGS] = {
[CLK_ALPHA_PLL_TYPE_DEFAULT] = {
[PLL_OFF_L_VAL] = 0x04,
[PLL_OFF_ALPHA_VAL] = 0x08,
[PLL_OFF_ALPHA_VAL_U] = 0x0c,
[PLL_OFF_TEST_CTL] = 0x10,
[PLL_OFF_TEST_CTL_U] = 0x14,
[PLL_OFF_USER_CTL] = 0x18,
[PLL_OFF_USER_CTL_U] = 0x1C,
[PLL_OFF_CONFIG_CTL] = 0x20,
[PLL_OFF_STATUS] = 0x24,
},
[CLK_ALPHA_PLL_TYPE_BRAMMO] = {
[PLL_OFF_L_VAL] = 0x04,
[PLL_OFF_ALPHA_VAL] = 0x08,
[PLL_OFF_ALPHA_VAL_U] = 0x0c,
[PLL_OFF_TEST_CTL] = 0x10,
[PLL_OFF_TEST_CTL_U] = 0x14,
[PLL_OFF_USER_CTL] = 0x18,
[PLL_OFF_CONFIG_CTL] = 0x1C,
[PLL_OFF_STATUS] = 0x20,
},
};
static struct clk_alpha_pll gpll0 = { static struct clk_alpha_pll gpll0 = {
.offset = 0x0, .offset = 0x0,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(0), .enable_mask = BIT(0),
...@@ -106,7 +82,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_aux2 = { ...@@ -106,7 +82,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_aux2 = {
.post_div_table = post_div_table_gpll0_out_aux2, .post_div_table = post_div_table_gpll0_out_aux2,
.num_post_div = ARRAY_SIZE(post_div_table_gpll0_out_aux2), .num_post_div = ARRAY_SIZE(post_div_table_gpll0_out_aux2),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll0_out_aux2", .name = "gpll0_out_aux2",
.parent_hws = (const struct clk_hw *[]){ &gpll0.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll0.clkr.hw },
...@@ -117,7 +93,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_aux2 = { ...@@ -117,7 +93,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_aux2 = {
static struct clk_alpha_pll gpll1 = { static struct clk_alpha_pll gpll1 = {
.offset = 0x1000, .offset = 0x1000,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(1), .enable_mask = BIT(1),
...@@ -147,7 +123,7 @@ static struct clk_alpha_pll gpll10 = { ...@@ -147,7 +123,7 @@ static struct clk_alpha_pll gpll10 = {
.offset = 0xa000, .offset = 0xa000,
.vco_table = spark_vco, .vco_table = spark_vco,
.num_vco = ARRAY_SIZE(spark_vco), .num_vco = ARRAY_SIZE(spark_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(10), .enable_mask = BIT(10),
...@@ -179,7 +155,7 @@ static struct clk_alpha_pll gpll11 = { ...@@ -179,7 +155,7 @@ static struct clk_alpha_pll gpll11 = {
.offset = 0xb000, .offset = 0xb000,
.vco_table = default_vco, .vco_table = default_vco,
.num_vco = ARRAY_SIZE(default_vco), .num_vco = ARRAY_SIZE(default_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.flags = SUPPORTS_DYNAMIC_UPDATE, .flags = SUPPORTS_DYNAMIC_UPDATE,
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
...@@ -197,7 +173,7 @@ static struct clk_alpha_pll gpll11 = { ...@@ -197,7 +173,7 @@ static struct clk_alpha_pll gpll11 = {
static struct clk_alpha_pll gpll3 = { static struct clk_alpha_pll gpll3 = {
.offset = 0x3000, .offset = 0x3000,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(3), .enable_mask = BIT(3),
...@@ -223,7 +199,7 @@ static struct clk_alpha_pll_postdiv gpll3_out_main = { ...@@ -223,7 +199,7 @@ static struct clk_alpha_pll_postdiv gpll3_out_main = {
.post_div_table = post_div_table_gpll3_out_main, .post_div_table = post_div_table_gpll3_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll3_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll3_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll3_out_main", .name = "gpll3_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll3.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll3.clkr.hw },
...@@ -234,7 +210,7 @@ static struct clk_alpha_pll_postdiv gpll3_out_main = { ...@@ -234,7 +210,7 @@ static struct clk_alpha_pll_postdiv gpll3_out_main = {
static struct clk_alpha_pll gpll4 = { static struct clk_alpha_pll gpll4 = {
.offset = 0x4000, .offset = 0x4000,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(4), .enable_mask = BIT(4),
...@@ -251,7 +227,7 @@ static struct clk_alpha_pll gpll4 = { ...@@ -251,7 +227,7 @@ static struct clk_alpha_pll gpll4 = {
static struct clk_alpha_pll gpll5 = { static struct clk_alpha_pll gpll5 = {
.offset = 0x5000, .offset = 0x5000,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(5), .enable_mask = BIT(5),
...@@ -268,7 +244,7 @@ static struct clk_alpha_pll gpll5 = { ...@@ -268,7 +244,7 @@ static struct clk_alpha_pll gpll5 = {
static struct clk_alpha_pll gpll6 = { static struct clk_alpha_pll gpll6 = {
.offset = 0x6000, .offset = 0x6000,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(6), .enable_mask = BIT(6),
...@@ -294,7 +270,7 @@ static struct clk_alpha_pll_postdiv gpll6_out_main = { ...@@ -294,7 +270,7 @@ static struct clk_alpha_pll_postdiv gpll6_out_main = {
.post_div_table = post_div_table_gpll6_out_main, .post_div_table = post_div_table_gpll6_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll6_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll6_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll6_out_main", .name = "gpll6_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll6.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll6.clkr.hw },
...@@ -305,7 +281,7 @@ static struct clk_alpha_pll_postdiv gpll6_out_main = { ...@@ -305,7 +281,7 @@ static struct clk_alpha_pll_postdiv gpll6_out_main = {
static struct clk_alpha_pll gpll7 = { static struct clk_alpha_pll gpll7 = {
.offset = 0x7000, .offset = 0x7000,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(7), .enable_mask = BIT(7),
...@@ -340,7 +316,7 @@ static struct clk_alpha_pll gpll8 = { ...@@ -340,7 +316,7 @@ static struct clk_alpha_pll gpll8 = {
.offset = 0x8000, .offset = 0x8000,
.vco_table = default_vco, .vco_table = default_vco,
.num_vco = ARRAY_SIZE(default_vco), .num_vco = ARRAY_SIZE(default_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.flags = SUPPORTS_DYNAMIC_UPDATE, .flags = SUPPORTS_DYNAMIC_UPDATE,
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
...@@ -367,7 +343,7 @@ static struct clk_alpha_pll_postdiv gpll8_out_main = { ...@@ -367,7 +343,7 @@ static struct clk_alpha_pll_postdiv gpll8_out_main = {
.post_div_table = post_div_table_gpll8_out_main, .post_div_table = post_div_table_gpll8_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll8_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll8_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll8_out_main", .name = "gpll8_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll8.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll8.clkr.hw },
...@@ -393,7 +369,7 @@ static struct clk_alpha_pll gpll9 = { ...@@ -393,7 +369,7 @@ static struct clk_alpha_pll gpll9 = {
.offset = 0x9000, .offset = 0x9000,
.vco_table = brammo_vco, .vco_table = brammo_vco,
.num_vco = ARRAY_SIZE(brammo_vco), .num_vco = ARRAY_SIZE(brammo_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_BRAMMO], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_BRAMMO_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(9), .enable_mask = BIT(9),
...@@ -419,7 +395,7 @@ static struct clk_alpha_pll_postdiv gpll9_out_main = { ...@@ -419,7 +395,7 @@ static struct clk_alpha_pll_postdiv gpll9_out_main = {
.post_div_table = post_div_table_gpll9_out_main, .post_div_table = post_div_table_gpll9_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll9_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll9_out_main),
.width = 2, .width = 2,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_BRAMMO], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_BRAMMO_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll9_out_main", .name = "gpll9_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll9.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll9.clkr.hw },
......
drivers/clk/qcom/gcc-sm6115.c
View file @ 9e48f051
...@@ -53,35 +53,11 @@ static struct pll_vco gpll10_vco[] = { ...@@ -53,35 +53,11 @@ static struct pll_vco gpll10_vco[] = {
{ 750000000, 1500000000, 1 }, { 750000000, 1500000000, 1 },
}; };
static const u8 clk_alpha_pll_regs_offset[][PLL_OFF_MAX_REGS] = {
[CLK_ALPHA_PLL_TYPE_DEFAULT] = {
[PLL_OFF_L_VAL] = 0x04,
[PLL_OFF_ALPHA_VAL] = 0x08,
[PLL_OFF_ALPHA_VAL_U] = 0x0c,
[PLL_OFF_TEST_CTL] = 0x10,
[PLL_OFF_TEST_CTL_U] = 0x14,
[PLL_OFF_USER_CTL] = 0x18,
[PLL_OFF_USER_CTL_U] = 0x1c,
[PLL_OFF_CONFIG_CTL] = 0x20,
[PLL_OFF_STATUS] = 0x24,
},
[CLK_ALPHA_PLL_TYPE_BRAMMO] = {
[PLL_OFF_L_VAL] = 0x04,
[PLL_OFF_ALPHA_VAL] = 0x08,
[PLL_OFF_ALPHA_VAL_U] = 0x0c,
[PLL_OFF_TEST_CTL] = 0x10,
[PLL_OFF_TEST_CTL_U] = 0x14,
[PLL_OFF_USER_CTL] = 0x18,
[PLL_OFF_CONFIG_CTL] = 0x1C,
[PLL_OFF_STATUS] = 0x20,
},
};
static struct clk_alpha_pll gpll0 = { static struct clk_alpha_pll gpll0 = {
.offset = 0x0, .offset = 0x0,
.vco_table = default_vco, .vco_table = default_vco,
.num_vco = ARRAY_SIZE(default_vco), .num_vco = ARRAY_SIZE(default_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(0), .enable_mask = BIT(0),
...@@ -107,7 +83,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_aux2 = { ...@@ -107,7 +83,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_aux2 = {
.post_div_table = post_div_table_gpll0_out_aux2, .post_div_table = post_div_table_gpll0_out_aux2,
.num_post_div = ARRAY_SIZE(post_div_table_gpll0_out_aux2), .num_post_div = ARRAY_SIZE(post_div_table_gpll0_out_aux2),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll0_out_aux2", .name = "gpll0_out_aux2",
.parent_hws = (const struct clk_hw *[]){ &gpll0.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll0.clkr.hw },
...@@ -127,7 +103,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_main = { ...@@ -127,7 +103,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_main = {
.post_div_table = post_div_table_gpll0_out_main, .post_div_table = post_div_table_gpll0_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll0_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll0_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll0_out_main", .name = "gpll0_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll0.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll0.clkr.hw },
...@@ -149,7 +125,7 @@ static struct clk_alpha_pll gpll10 = { ...@@ -149,7 +125,7 @@ static struct clk_alpha_pll gpll10 = {
.offset = 0xa000, .offset = 0xa000,
.vco_table = gpll10_vco, .vco_table = gpll10_vco,
.num_vco = ARRAY_SIZE(gpll10_vco), .num_vco = ARRAY_SIZE(gpll10_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(10), .enable_mask = BIT(10),
...@@ -175,7 +151,7 @@ static struct clk_alpha_pll_postdiv gpll10_out_main = { ...@@ -175,7 +151,7 @@ static struct clk_alpha_pll_postdiv gpll10_out_main = {
.post_div_table = post_div_table_gpll10_out_main, .post_div_table = post_div_table_gpll10_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll10_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll10_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll10_out_main", .name = "gpll10_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll10.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll10.clkr.hw },
...@@ -201,7 +177,7 @@ static struct clk_alpha_pll gpll11 = { ...@@ -201,7 +177,7 @@ static struct clk_alpha_pll gpll11 = {
.vco_table = default_vco, .vco_table = default_vco,
.num_vco = ARRAY_SIZE(default_vco), .num_vco = ARRAY_SIZE(default_vco),
.flags = SUPPORTS_DYNAMIC_UPDATE, .flags = SUPPORTS_DYNAMIC_UPDATE,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(11), .enable_mask = BIT(11),
...@@ -227,7 +203,7 @@ static struct clk_alpha_pll_postdiv gpll11_out_main = { ...@@ -227,7 +203,7 @@ static struct clk_alpha_pll_postdiv gpll11_out_main = {
.post_div_table = post_div_table_gpll11_out_main, .post_div_table = post_div_table_gpll11_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll11_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll11_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll11_out_main", .name = "gpll11_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll11.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll11.clkr.hw },
...@@ -241,7 +217,7 @@ static struct clk_alpha_pll gpll3 = { ...@@ -241,7 +217,7 @@ static struct clk_alpha_pll gpll3 = {
.offset = 0x3000, .offset = 0x3000,
.vco_table = default_vco, .vco_table = default_vco,
.num_vco = ARRAY_SIZE(default_vco), .num_vco = ARRAY_SIZE(default_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(3), .enable_mask = BIT(3),
...@@ -260,7 +236,7 @@ static struct clk_alpha_pll gpll4 = { ...@@ -260,7 +236,7 @@ static struct clk_alpha_pll gpll4 = {
.offset = 0x4000, .offset = 0x4000,
.vco_table = default_vco, .vco_table = default_vco,
.num_vco = ARRAY_SIZE(default_vco), .num_vco = ARRAY_SIZE(default_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(4), .enable_mask = BIT(4),
...@@ -286,7 +262,7 @@ static struct clk_alpha_pll_postdiv gpll4_out_main = { ...@@ -286,7 +262,7 @@ static struct clk_alpha_pll_postdiv gpll4_out_main = {
.post_div_table = post_div_table_gpll4_out_main, .post_div_table = post_div_table_gpll4_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll4_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll4_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll4_out_main", .name = "gpll4_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll4.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll4.clkr.hw },
...@@ -299,7 +275,7 @@ static struct clk_alpha_pll gpll6 = { ...@@ -299,7 +275,7 @@ static struct clk_alpha_pll gpll6 = {
.offset = 0x6000, .offset = 0x6000,
.vco_table = default_vco, .vco_table = default_vco,
.num_vco = ARRAY_SIZE(default_vco), .num_vco = ARRAY_SIZE(default_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(6), .enable_mask = BIT(6),
...@@ -325,7 +301,7 @@ static struct clk_alpha_pll_postdiv gpll6_out_main = { ...@@ -325,7 +301,7 @@ static struct clk_alpha_pll_postdiv gpll6_out_main = {
.post_div_table = post_div_table_gpll6_out_main, .post_div_table = post_div_table_gpll6_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll6_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll6_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll6_out_main", .name = "gpll6_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll6.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll6.clkr.hw },
...@@ -338,7 +314,7 @@ static struct clk_alpha_pll gpll7 = { ...@@ -338,7 +314,7 @@ static struct clk_alpha_pll gpll7 = {
.offset = 0x7000, .offset = 0x7000,
.vco_table = default_vco, .vco_table = default_vco,
.num_vco = ARRAY_SIZE(default_vco), .num_vco = ARRAY_SIZE(default_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(7), .enable_mask = BIT(7),
...@@ -364,7 +340,7 @@ static struct clk_alpha_pll_postdiv gpll7_out_main = { ...@@ -364,7 +340,7 @@ static struct clk_alpha_pll_postdiv gpll7_out_main = {
.post_div_table = post_div_table_gpll7_out_main, .post_div_table = post_div_table_gpll7_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll7_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll7_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll7_out_main", .name = "gpll7_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll7.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll7.clkr.hw },
...@@ -392,7 +368,7 @@ static struct clk_alpha_pll gpll8 = { ...@@ -392,7 +368,7 @@ static struct clk_alpha_pll gpll8 = {
.offset = 0x8000, .offset = 0x8000,
.vco_table = default_vco, .vco_table = default_vco,
.num_vco = ARRAY_SIZE(default_vco), .num_vco = ARRAY_SIZE(default_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.flags = SUPPORTS_DYNAMIC_UPDATE, .flags = SUPPORTS_DYNAMIC_UPDATE,
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
...@@ -419,7 +395,7 @@ static struct clk_alpha_pll_postdiv gpll8_out_main = { ...@@ -419,7 +395,7 @@ static struct clk_alpha_pll_postdiv gpll8_out_main = {
.post_div_table = post_div_table_gpll8_out_main, .post_div_table = post_div_table_gpll8_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll8_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll8_out_main),
.width = 4, .width = 4,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll8_out_main", .name = "gpll8_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll8.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll8.clkr.hw },
...@@ -443,7 +419,7 @@ static struct clk_alpha_pll gpll9 = { ...@@ -443,7 +419,7 @@ static struct clk_alpha_pll gpll9 = {
.offset = 0x9000, .offset = 0x9000,
.vco_table = gpll9_vco, .vco_table = gpll9_vco,
.num_vco = ARRAY_SIZE(gpll9_vco), .num_vco = ARRAY_SIZE(gpll9_vco),
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_BRAMMO], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_BRAMMO_EVO],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(9), .enable_mask = BIT(9),
...@@ -469,7 +445,7 @@ static struct clk_alpha_pll_postdiv gpll9_out_main = { ...@@ -469,7 +445,7 @@ static struct clk_alpha_pll_postdiv gpll9_out_main = {
.post_div_table = post_div_table_gpll9_out_main, .post_div_table = post_div_table_gpll9_out_main,
.num_post_div = ARRAY_SIZE(post_div_table_gpll9_out_main), .num_post_div = ARRAY_SIZE(post_div_table_gpll9_out_main),
.width = 2, .width = 2,
.regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_BRAMMO], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_BRAMMO_EVO],
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gpll9_out_main", .name = "gpll9_out_main",
.parent_hws = (const struct clk_hw *[]){ &gpll9.clkr.hw }, .parent_hws = (const struct clk_hw *[]){ &gpll9.clkr.hw },
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7