Skip to content

L
linux
Commit 068a0605 authored by Adam Skladowski's avatar Adam Skladowski Committed by Bjorn Andersson
Browse files
Options

clk: qcom: gcc-sm6115: Override default Alpha PLL regs 

The DEFAULT and BRAMMO PLL offsets are non-standard in downstream, but
currently only BRAMMO ones are overridden. Override DEFAULT ones too.

A very similar thing is happening in gcc-qcm2290 driver.

Fixes: cbe63bfd ("clk: qcom: Add Global Clock controller (GCC) driver for SM6115")
Signed-off-by: default avatarAdam Skladowski <a_skl39@protonmail.com>
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-2-iskren.chernev@gmail.com
parent 16fb89f9
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 16 deletions
drivers/clk/qcom/gcc-sm6115.c
View file @ 068a0605
...@@ -53,11 +53,25 @@ static struct pll_vco gpll10_vco[] = { ...@@ -53,11 +53,25 @@ 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,
},
};
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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(0), .enable_mask = BIT(0),
...@@ -83,7 +97,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_aux2 = { ...@@ -83,7 +97,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.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 },
...@@ -115,7 +129,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_main = { ...@@ -115,7 +129,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.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 },
...@@ -137,7 +151,7 @@ static struct clk_alpha_pll gpll10 = { ...@@ -137,7 +151,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(10), .enable_mask = BIT(10),
...@@ -163,7 +177,7 @@ static struct clk_alpha_pll_postdiv gpll10_out_main = { ...@@ -163,7 +177,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.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 },
...@@ -189,7 +203,7 @@ static struct clk_alpha_pll gpll11 = { ...@@ -189,7 +203,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(11), .enable_mask = BIT(11),
...@@ -215,7 +229,7 @@ static struct clk_alpha_pll_postdiv gpll11_out_main = { ...@@ -215,7 +229,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.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 },
...@@ -229,7 +243,7 @@ static struct clk_alpha_pll gpll3 = { ...@@ -229,7 +243,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(3), .enable_mask = BIT(3),
...@@ -248,7 +262,7 @@ static struct clk_alpha_pll gpll4 = { ...@@ -248,7 +262,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(4), .enable_mask = BIT(4),
...@@ -274,7 +288,7 @@ static struct clk_alpha_pll_postdiv gpll4_out_main = { ...@@ -274,7 +288,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.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 },
...@@ -287,7 +301,7 @@ static struct clk_alpha_pll gpll6 = { ...@@ -287,7 +301,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(6), .enable_mask = BIT(6),
...@@ -313,7 +327,7 @@ static struct clk_alpha_pll_postdiv gpll6_out_main = { ...@@ -313,7 +327,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.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 },
...@@ -326,7 +340,7 @@ static struct clk_alpha_pll gpll7 = { ...@@ -326,7 +340,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
.enable_mask = BIT(7), .enable_mask = BIT(7),
...@@ -352,7 +366,7 @@ static struct clk_alpha_pll_postdiv gpll7_out_main = { ...@@ -352,7 +366,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.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 },
...@@ -380,7 +394,7 @@ static struct clk_alpha_pll gpll8 = { ...@@ -380,7 +394,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.flags = SUPPORTS_DYNAMIC_UPDATE, .flags = SUPPORTS_DYNAMIC_UPDATE,
.clkr = { .clkr = {
.enable_reg = 0x79000, .enable_reg = 0x79000,
...@@ -407,7 +421,7 @@ static struct clk_alpha_pll_postdiv gpll8_out_main = { ...@@ -407,7 +421,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[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs_offset[CLK_ALPHA_PLL_TYPE_DEFAULT],
.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 },
......
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