Skip to content

L
linux
Commit 44740af8 authored by Robert Marko's avatar Robert Marko Committed by Bjorn Andersson
Browse files
Options

clk: qcom: gcc-ipq4019: convert XO and sleep clk to parent_data 

Start off IPQ4019 GCC conversion by converting XO and sleep clks to
parent data in order to directly pass them.
Signed-off-by: default avatarRobert Marko <robert.marko@sartura.hr>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230214162325.312057-2-robert.marko@sartura.hr
parent 78b1607c
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 30 deletions
drivers/clk/qcom/gcc-ipq4019.c
View file @ 44740af8
...@@ -657,8 +657,9 @@ static struct clk_branch gcc_dcd_xo_clk = { ...@@ -657,8 +657,9 @@ static struct clk_branch gcc_dcd_xo_clk = {
.enable_mask = BIT(0), .enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gcc_dcd_xo_clk", .name = "gcc_dcd_xo_clk",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
...@@ -954,8 +955,9 @@ static struct clk_branch gcc_usb2_sleep_clk = { ...@@ -954,8 +955,9 @@ static struct clk_branch gcc_usb2_sleep_clk = {
.enable_mask = BIT(0), .enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gcc_usb2_sleep_clk", .name = "gcc_usb2_sleep_clk",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"gcc_sleep_clk_src", .fw_name = "sleep_clk",
.name = "gcc_sleep_clk_src",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
...@@ -1021,8 +1023,9 @@ static struct clk_branch gcc_usb3_sleep_clk = { ...@@ -1021,8 +1023,9 @@ static struct clk_branch gcc_usb3_sleep_clk = {
.enable_mask = BIT(0), .enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gcc_usb3_sleep_clk", .name = "gcc_usb3_sleep_clk",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"gcc_sleep_clk_src", .fw_name = "sleep_clk",
.name = "gcc_sleep_clk_src",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
...@@ -1110,8 +1113,9 @@ static struct clk_branch gcc_wcss2g_ref_clk = { ...@@ -1110,8 +1113,9 @@ static struct clk_branch gcc_wcss2g_ref_clk = {
.enable_mask = BIT(0), .enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gcc_wcss2g_ref_clk", .name = "gcc_wcss2g_ref_clk",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
...@@ -1127,8 +1131,9 @@ static struct clk_branch gcc_wcss2g_rtc_clk = { ...@@ -1127,8 +1131,9 @@ static struct clk_branch gcc_wcss2g_rtc_clk = {
.enable_mask = BIT(0), .enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gcc_wcss2g_rtc_clk", .name = "gcc_wcss2g_rtc_clk",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"gcc_sleep_clk_src", .fw_name = "sleep_clk",
.name = "gcc_sleep_clk_src",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
...@@ -1179,8 +1184,9 @@ static struct clk_branch gcc_wcss5g_ref_clk = { ...@@ -1179,8 +1184,9 @@ static struct clk_branch gcc_wcss5g_ref_clk = {
.enable_mask = BIT(0), .enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gcc_wcss5g_ref_clk", .name = "gcc_wcss5g_ref_clk",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
...@@ -1196,8 +1202,9 @@ static struct clk_branch gcc_wcss5g_rtc_clk = { ...@@ -1196,8 +1202,9 @@ static struct clk_branch gcc_wcss5g_rtc_clk = {
.enable_mask = BIT(0), .enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gcc_wcss5g_rtc_clk", .name = "gcc_wcss5g_rtc_clk",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"gcc_sleep_clk_src", .fw_name = "sleep_clk",
.name = "gcc_sleep_clk_src",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
...@@ -1360,8 +1367,9 @@ static struct clk_fepll gcc_apss_cpu_plldiv_clk = { ...@@ -1360,8 +1367,9 @@ static struct clk_fepll gcc_apss_cpu_plldiv_clk = {
.enable_mask = BIT(0), .enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "ddrpllapss", .name = "ddrpllapss",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_regmap_cpu_div_ops, .ops = &clk_regmap_cpu_div_ops,
...@@ -1412,8 +1420,9 @@ static struct clk_fepll gcc_apss_sdcc_clk = { ...@@ -1412,8 +1420,9 @@ static struct clk_fepll gcc_apss_sdcc_clk = {
.cdiv.clkr = { .cdiv.clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "ddrpllsdcc", .name = "ddrpllsdcc",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_fepll_div_ops, .ops = &clk_fepll_div_ops,
...@@ -1427,8 +1436,9 @@ static struct clk_fepll gcc_fepll125_clk = { ...@@ -1427,8 +1436,9 @@ static struct clk_fepll gcc_fepll125_clk = {
.cdiv.clkr = { .cdiv.clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "fepll125", .name = "fepll125",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_fepll_div_ops, .ops = &clk_fepll_div_ops,
...@@ -1442,8 +1452,9 @@ static struct clk_fepll gcc_fepll125dly_clk = { ...@@ -1442,8 +1452,9 @@ static struct clk_fepll gcc_fepll125dly_clk = {
.cdiv.clkr = { .cdiv.clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "fepll125dly", .name = "fepll125dly",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_fepll_div_ops, .ops = &clk_fepll_div_ops,
...@@ -1457,8 +1468,9 @@ static struct clk_fepll gcc_fepll200_clk = { ...@@ -1457,8 +1468,9 @@ static struct clk_fepll gcc_fepll200_clk = {
.cdiv.clkr = { .cdiv.clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "fepll200", .name = "fepll200",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_fepll_div_ops, .ops = &clk_fepll_div_ops,
...@@ -1472,8 +1484,9 @@ static struct clk_fepll gcc_fepll500_clk = { ...@@ -1472,8 +1484,9 @@ static struct clk_fepll gcc_fepll500_clk = {
.cdiv.clkr = { .cdiv.clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "fepll500", .name = "fepll500",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_fepll_div_ops, .ops = &clk_fepll_div_ops,
...@@ -1497,8 +1510,9 @@ static struct clk_fepll gcc_fepllwcss2g_clk = { ...@@ -1497,8 +1510,9 @@ static struct clk_fepll gcc_fepllwcss2g_clk = {
.cdiv.clkr = { .cdiv.clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "fepllwcss2g", .name = "fepllwcss2g",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_fepll_div_ops, .ops = &clk_fepll_div_ops,
...@@ -1515,8 +1529,9 @@ static struct clk_fepll gcc_fepllwcss5g_clk = { ...@@ -1515,8 +1529,9 @@ static struct clk_fepll gcc_fepllwcss5g_clk = {
.cdiv.clkr = { .cdiv.clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "fepllwcss5g", .name = "fepllwcss5g",
.parent_names = (const char *[]){ .parent_data = &(const struct clk_parent_data){
"xo", .fw_name = "xo",
.name = "xo",
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_fepll_div_ops, .ops = &clk_fepll_div_ops,
......
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