Skip to content

L
linux
Commit cb02866f authored by Ansuel Smith's avatar Ansuel Smith Committed by Bjorn Andersson
Browse files
Options

clk: qcom: gcc-ipq806x: convert parent_names to parent_data 

Convert parent_names to parent_data to modernize the driver.
Where possible use parent_hws directly.
Signed-off-by: default avatarAnsuel Smith <ansuelsmth@gmail.com>
Tested-by: default avatarJonathan McDowell <noodles@earth.li>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220226135235.10051-6-ansuelsmth@gmail.com
parent e95e8253
Show whitespace changes
Inline Side-by-side
Showing with 173 additions and 113 deletions
drivers/clk/qcom/gcc-ipq806x.c
View file @ cb02866f
...@@ -25,6 +25,10 @@ ...@@ -25,6 +25,10 @@
#include "clk-hfpll.h" #include "clk-hfpll.h"
#include "reset.h" #include "reset.h"
static const struct clk_parent_data gcc_pxo[] = {
{ .fw_name = "pxo", .name = "pxo" },
};
static struct clk_pll pll0 = { static struct clk_pll pll0 = {
.l_reg = 0x30c4, .l_reg = 0x30c4,
.m_reg = 0x30c8, .m_reg = 0x30c8,
...@@ -35,7 +39,7 @@ static struct clk_pll pll0 = { ...@@ -35,7 +39,7 @@ static struct clk_pll pll0 = {
.status_bit = 16, .status_bit = 16,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "pll0", .name = "pll0",
.parent_names = (const char *[]){ "pxo" }, .parent_data = gcc_pxo,
.num_parents = 1, .num_parents = 1,
.ops = &clk_pll_ops, .ops = &clk_pll_ops,
}, },
...@@ -46,7 +50,9 @@ static struct clk_regmap pll0_vote = { ...@@ -46,7 +50,9 @@ static struct clk_regmap pll0_vote = {
.enable_mask = BIT(0), .enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pll0_vote", .name = "pll0_vote",
.parent_names = (const char *[]){ "pll0" }, .parent_hws = (const struct clk_hw*[]){
&pll0.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_pll_vote_ops, .ops = &clk_pll_vote_ops,
}, },
...@@ -62,7 +68,7 @@ static struct clk_pll pll3 = { ...@@ -62,7 +68,7 @@ static struct clk_pll pll3 = {
.status_bit = 16, .status_bit = 16,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "pll3", .name = "pll3",
.parent_names = (const char *[]){ "pxo" }, .parent_data = gcc_pxo,
.num_parents = 1, .num_parents = 1,
.ops = &clk_pll_ops, .ops = &clk_pll_ops,
}, },
...@@ -89,7 +95,7 @@ static struct clk_pll pll8 = { ...@@ -89,7 +95,7 @@ static struct clk_pll pll8 = {
.status_bit = 16, .status_bit = 16,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "pll8", .name = "pll8",
.parent_names = (const char *[]){ "pxo" }, .parent_data = gcc_pxo,
.num_parents = 1, .num_parents = 1,
.ops = &clk_pll_ops, .ops = &clk_pll_ops,
}, },
...@@ -100,7 +106,9 @@ static struct clk_regmap pll8_vote = { ...@@ -100,7 +106,9 @@ static struct clk_regmap pll8_vote = {
.enable_mask = BIT(8), .enable_mask = BIT(8),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pll8_vote", .name = "pll8_vote",
.parent_names = (const char *[]){ "pll8" }, .parent_hws = (const struct clk_hw*[]){
&pll8.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_pll_vote_ops, .ops = &clk_pll_vote_ops,
}, },
...@@ -123,7 +131,7 @@ static struct hfpll_data hfpll0_data = { ...@@ -123,7 +131,7 @@ static struct hfpll_data hfpll0_data = {
static struct clk_hfpll hfpll0 = { static struct clk_hfpll hfpll0 = {
.d = &hfpll0_data, .d = &hfpll0_data,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.parent_names = (const char *[]){ "pxo" }, .parent_data = gcc_pxo,
.num_parents = 1, .num_parents = 1,
.name = "hfpll0", .name = "hfpll0",
.ops = &clk_ops_hfpll, .ops = &clk_ops_hfpll,
...@@ -149,7 +157,7 @@ static struct hfpll_data hfpll1_data = { ...@@ -149,7 +157,7 @@ static struct hfpll_data hfpll1_data = {
static struct clk_hfpll hfpll1 = { static struct clk_hfpll hfpll1 = {
.d = &hfpll1_data, .d = &hfpll1_data,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.parent_names = (const char *[]){ "pxo" }, .parent_data = gcc_pxo,
.num_parents = 1, .num_parents = 1,
.name = "hfpll1", .name = "hfpll1",
.ops = &clk_ops_hfpll, .ops = &clk_ops_hfpll,
...@@ -175,7 +183,7 @@ static struct hfpll_data hfpll_l2_data = { ...@@ -175,7 +183,7 @@ static struct hfpll_data hfpll_l2_data = {
static struct clk_hfpll hfpll_l2 = { static struct clk_hfpll hfpll_l2 = {
.d = &hfpll_l2_data, .d = &hfpll_l2_data,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.parent_names = (const char *[]){ "pxo" }, .parent_data = gcc_pxo,
.num_parents = 1, .num_parents = 1,
.name = "hfpll_l2", .name = "hfpll_l2",
.ops = &clk_ops_hfpll, .ops = &clk_ops_hfpll,
...@@ -194,7 +202,7 @@ static struct clk_pll pll14 = { ...@@ -194,7 +202,7 @@ static struct clk_pll pll14 = {
.status_bit = 16, .status_bit = 16,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "pll14", .name = "pll14",
.parent_names = (const char *[]){ "pxo" }, .parent_data = gcc_pxo,
.num_parents = 1, .num_parents = 1,
.ops = &clk_pll_ops, .ops = &clk_pll_ops,
}, },
...@@ -205,7 +213,9 @@ static struct clk_regmap pll14_vote = { ...@@ -205,7 +213,9 @@ static struct clk_regmap pll14_vote = {
.enable_mask = BIT(14), .enable_mask = BIT(14),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pll14_vote", .name = "pll14_vote",
.parent_names = (const char *[]){ "pll14" }, .parent_hws = (const struct clk_hw*[]){
&pll14.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_pll_vote_ops, .ops = &clk_pll_vote_ops,
}, },
...@@ -238,7 +248,7 @@ static struct clk_pll pll18 = { ...@@ -238,7 +248,7 @@ static struct clk_pll pll18 = {
.freq_tbl = pll18_freq_tbl, .freq_tbl = pll18_freq_tbl,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "pll18", .name = "pll18",
.parent_names = (const char *[]){ "pxo" }, .parent_data = gcc_pxo,
.num_parents = 1, .num_parents = 1,
.ops = &clk_pll_ops, .ops = &clk_pll_ops,
}, },
...@@ -259,9 +269,9 @@ static const struct parent_map gcc_pxo_pll8_map[] = { ...@@ -259,9 +269,9 @@ static const struct parent_map gcc_pxo_pll8_map[] = {
{ P_PLL8, 3 } { P_PLL8, 3 }
}; };
static const char * const gcc_pxo_pll8[] = { static const struct clk_parent_data gcc_pxo_pll8[] = {
"pxo", { .fw_name = "pxo", .name = "pxo" },
"pll8_vote", { .hw = &pll8_vote.hw },
}; };
static const struct parent_map gcc_pxo_pll8_cxo_map[] = { static const struct parent_map gcc_pxo_pll8_cxo_map[] = {
...@@ -270,10 +280,10 @@ static const struct parent_map gcc_pxo_pll8_cxo_map[] = { ...@@ -270,10 +280,10 @@ static const struct parent_map gcc_pxo_pll8_cxo_map[] = {
{ P_CXO, 5 } { P_CXO, 5 }
}; };
static const char * const gcc_pxo_pll8_cxo[] = { static const struct clk_parent_data gcc_pxo_pll8_cxo[] = {
"pxo", { .fw_name = "pxo", .name = "pxo" },
"pll8_vote", { .hw = &pll8_vote.hw },
"cxo", { .fw_name = "cxo", .name = "cxo" },
}; };
static const struct parent_map gcc_pxo_pll3_map[] = { static const struct parent_map gcc_pxo_pll3_map[] = {
...@@ -286,9 +296,9 @@ static const struct parent_map gcc_pxo_pll3_sata_map[] = { ...@@ -286,9 +296,9 @@ static const struct parent_map gcc_pxo_pll3_sata_map[] = {
{ P_PLL3, 6 } { P_PLL3, 6 }
}; };
static const char * const gcc_pxo_pll3[] = { static const struct clk_parent_data gcc_pxo_pll3[] = {
"pxo", { .fw_name = "pxo", .name = "pxo" },
"pll3", { .hw = &pll3.clkr.hw },
}; };
static const struct parent_map gcc_pxo_pll8_pll0_map[] = { static const struct parent_map gcc_pxo_pll8_pll0_map[] = {
...@@ -297,10 +307,10 @@ static const struct parent_map gcc_pxo_pll8_pll0_map[] = { ...@@ -297,10 +307,10 @@ static const struct parent_map gcc_pxo_pll8_pll0_map[] = {
{ P_PLL0, 2 } { P_PLL0, 2 }
}; };
static const char * const gcc_pxo_pll8_pll0[] = { static const struct clk_parent_data gcc_pxo_pll8_pll0[] = {
"pxo", { .fw_name = "pxo", .name = "pxo" },
"pll8_vote", { .hw = &pll8_vote.hw },
"pll0_vote", { .hw = &pll0_vote.hw },
}; };
static const struct parent_map gcc_pxo_pll8_pll14_pll18_pll0_map[] = { static const struct parent_map gcc_pxo_pll8_pll14_pll18_pll0_map[] = {
...@@ -311,12 +321,12 @@ static const struct parent_map gcc_pxo_pll8_pll14_pll18_pll0_map[] = { ...@@ -311,12 +321,12 @@ static const struct parent_map gcc_pxo_pll8_pll14_pll18_pll0_map[] = {
{ P_PLL18, 1 } { P_PLL18, 1 }
}; };
static const char * const gcc_pxo_pll8_pll14_pll18_pll0[] = { static const struct clk_parent_data gcc_pxo_pll8_pll14_pll18_pll0[] = {
"pxo", { .fw_name = "pxo", .name = "pxo" },
"pll8_vote", { .hw = &pll8_vote.hw },
"pll0_vote", { .hw = &pll0_vote.hw },
"pll14", { .hw = &pll14.clkr.hw },
"pll18", { .hw = &pll18.clkr.hw },
}; };
static struct freq_tbl clk_tbl_gsbi_uart[] = { static struct freq_tbl clk_tbl_gsbi_uart[] = {
...@@ -362,7 +372,7 @@ static struct clk_rcg gsbi1_uart_src = { ...@@ -362,7 +372,7 @@ static struct clk_rcg gsbi1_uart_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi1_uart_src", .name = "gsbi1_uart_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -378,8 +388,8 @@ static struct clk_branch gsbi1_uart_clk = { ...@@ -378,8 +388,8 @@ static struct clk_branch gsbi1_uart_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi1_uart_clk", .name = "gsbi1_uart_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gsbi1_uart_src", &gsbi1_uart_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -413,7 +423,7 @@ static struct clk_rcg gsbi2_uart_src = { ...@@ -413,7 +423,7 @@ static struct clk_rcg gsbi2_uart_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi2_uart_src", .name = "gsbi2_uart_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -429,8 +439,8 @@ static struct clk_branch gsbi2_uart_clk = { ...@@ -429,8 +439,8 @@ static struct clk_branch gsbi2_uart_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi2_uart_clk", .name = "gsbi2_uart_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gsbi2_uart_src", &gsbi2_uart_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -464,7 +474,7 @@ static struct clk_rcg gsbi4_uart_src = { ...@@ -464,7 +474,7 @@ static struct clk_rcg gsbi4_uart_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi4_uart_src", .name = "gsbi4_uart_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -480,8 +490,8 @@ static struct clk_branch gsbi4_uart_clk = { ...@@ -480,8 +490,8 @@ static struct clk_branch gsbi4_uart_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi4_uart_clk", .name = "gsbi4_uart_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gsbi4_uart_src", &gsbi4_uart_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -515,7 +525,7 @@ static struct clk_rcg gsbi5_uart_src = { ...@@ -515,7 +525,7 @@ static struct clk_rcg gsbi5_uart_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi5_uart_src", .name = "gsbi5_uart_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -531,8 +541,8 @@ static struct clk_branch gsbi5_uart_clk = { ...@@ -531,8 +541,8 @@ static struct clk_branch gsbi5_uart_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi5_uart_clk", .name = "gsbi5_uart_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gsbi5_uart_src", &gsbi5_uart_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -566,7 +576,7 @@ static struct clk_rcg gsbi6_uart_src = { ...@@ -566,7 +576,7 @@ static struct clk_rcg gsbi6_uart_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi6_uart_src", .name = "gsbi6_uart_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -582,8 +592,8 @@ static struct clk_branch gsbi6_uart_clk = { ...@@ -582,8 +592,8 @@ static struct clk_branch gsbi6_uart_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi6_uart_clk", .name = "gsbi6_uart_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gsbi6_uart_src", &gsbi6_uart_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -617,7 +627,7 @@ static struct clk_rcg gsbi7_uart_src = { ...@@ -617,7 +627,7 @@ static struct clk_rcg gsbi7_uart_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi7_uart_src", .name = "gsbi7_uart_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -633,8 +643,8 @@ static struct clk_branch gsbi7_uart_clk = { ...@@ -633,8 +643,8 @@ static struct clk_branch gsbi7_uart_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi7_uart_clk", .name = "gsbi7_uart_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gsbi7_uart_src", &gsbi7_uart_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -681,7 +691,7 @@ static struct clk_rcg gsbi1_qup_src = { ...@@ -681,7 +691,7 @@ static struct clk_rcg gsbi1_qup_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi1_qup_src", .name = "gsbi1_qup_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -697,7 +707,9 @@ static struct clk_branch gsbi1_qup_clk = { ...@@ -697,7 +707,9 @@ static struct clk_branch gsbi1_qup_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi1_qup_clk", .name = "gsbi1_qup_clk",
.parent_names = (const char *[]){ "gsbi1_qup_src" }, .parent_hws = (const struct clk_hw*[]){
&gsbi1_qup_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -730,7 +742,7 @@ static struct clk_rcg gsbi2_qup_src = { ...@@ -730,7 +742,7 @@ static struct clk_rcg gsbi2_qup_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi2_qup_src", .name = "gsbi2_qup_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -746,7 +758,9 @@ static struct clk_branch gsbi2_qup_clk = { ...@@ -746,7 +758,9 @@ static struct clk_branch gsbi2_qup_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi2_qup_clk", .name = "gsbi2_qup_clk",
.parent_names = (const char *[]){ "gsbi2_qup_src" }, .parent_hws = (const struct clk_hw*[]){
&gsbi2_qup_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -779,7 +793,7 @@ static struct clk_rcg gsbi4_qup_src = { ...@@ -779,7 +793,7 @@ static struct clk_rcg gsbi4_qup_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi4_qup_src", .name = "gsbi4_qup_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -795,7 +809,9 @@ static struct clk_branch gsbi4_qup_clk = { ...@@ -795,7 +809,9 @@ static struct clk_branch gsbi4_qup_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi4_qup_clk", .name = "gsbi4_qup_clk",
.parent_names = (const char *[]){ "gsbi4_qup_src" }, .parent_hws = (const struct clk_hw*[]){
&gsbi4_qup_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -828,7 +844,7 @@ static struct clk_rcg gsbi5_qup_src = { ...@@ -828,7 +844,7 @@ static struct clk_rcg gsbi5_qup_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi5_qup_src", .name = "gsbi5_qup_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -844,7 +860,9 @@ static struct clk_branch gsbi5_qup_clk = { ...@@ -844,7 +860,9 @@ static struct clk_branch gsbi5_qup_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi5_qup_clk", .name = "gsbi5_qup_clk",
.parent_names = (const char *[]){ "gsbi5_qup_src" }, .parent_hws = (const struct clk_hw*[]){
&gsbi5_qup_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -877,7 +895,7 @@ static struct clk_rcg gsbi6_qup_src = { ...@@ -877,7 +895,7 @@ static struct clk_rcg gsbi6_qup_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi6_qup_src", .name = "gsbi6_qup_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -893,7 +911,9 @@ static struct clk_branch gsbi6_qup_clk = { ...@@ -893,7 +911,9 @@ static struct clk_branch gsbi6_qup_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi6_qup_clk", .name = "gsbi6_qup_clk",
.parent_names = (const char *[]){ "gsbi6_qup_src" }, .parent_hws = (const struct clk_hw*[]){
&gsbi6_qup_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -926,7 +946,7 @@ static struct clk_rcg gsbi7_qup_src = { ...@@ -926,7 +946,7 @@ static struct clk_rcg gsbi7_qup_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi7_qup_src", .name = "gsbi7_qup_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -942,7 +962,9 @@ static struct clk_branch gsbi7_qup_clk = { ...@@ -942,7 +962,9 @@ static struct clk_branch gsbi7_qup_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gsbi7_qup_clk", .name = "gsbi7_qup_clk",
.parent_names = (const char *[]){ "gsbi7_qup_src" }, .parent_hws = (const struct clk_hw*[]){
&gsbi7_qup_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1076,7 +1098,7 @@ static struct clk_rcg gp0_src = { ...@@ -1076,7 +1098,7 @@ static struct clk_rcg gp0_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gp0_src", .name = "gp0_src",
.parent_names = gcc_pxo_pll8_cxo, .parent_data = gcc_pxo_pll8_cxo,
.num_parents = 3, .num_parents = 3,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_PARENT_GATE, .flags = CLK_SET_PARENT_GATE,
...@@ -1092,7 +1114,9 @@ static struct clk_branch gp0_clk = { ...@@ -1092,7 +1114,9 @@ static struct clk_branch gp0_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gp0_clk", .name = "gp0_clk",
.parent_names = (const char *[]){ "gp0_src" }, .parent_hws = (const struct clk_hw*[]){
&gp0_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1125,7 +1149,7 @@ static struct clk_rcg gp1_src = { ...@@ -1125,7 +1149,7 @@ static struct clk_rcg gp1_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gp1_src", .name = "gp1_src",
.parent_names = gcc_pxo_pll8_cxo, .parent_data = gcc_pxo_pll8_cxo,
.num_parents = 3, .num_parents = 3,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -1141,7 +1165,9 @@ static struct clk_branch gp1_clk = { ...@@ -1141,7 +1165,9 @@ static struct clk_branch gp1_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gp1_clk", .name = "gp1_clk",
.parent_names = (const char *[]){ "gp1_src" }, .parent_hws = (const struct clk_hw*[]){
&gp1_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1174,7 +1200,7 @@ static struct clk_rcg gp2_src = { ...@@ -1174,7 +1200,7 @@ static struct clk_rcg gp2_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gp2_src", .name = "gp2_src",
.parent_names = gcc_pxo_pll8_cxo, .parent_data = gcc_pxo_pll8_cxo,
.num_parents = 3, .num_parents = 3,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -1190,7 +1216,9 @@ static struct clk_branch gp2_clk = { ...@@ -1190,7 +1216,9 @@ static struct clk_branch gp2_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gp2_clk", .name = "gp2_clk",
.parent_names = (const char *[]){ "gp2_src" }, .parent_hws = (const struct clk_hw*[]){
&gp2_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1228,7 +1256,7 @@ static struct clk_rcg prng_src = { ...@@ -1228,7 +1256,7 @@ static struct clk_rcg prng_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "prng_src", .name = "prng_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
}, },
...@@ -1244,7 +1272,9 @@ static struct clk_branch prng_clk = { ...@@ -1244,7 +1272,9 @@ static struct clk_branch prng_clk = {
.enable_mask = BIT(10), .enable_mask = BIT(10),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "prng_clk", .name = "prng_clk",
.parent_names = (const char *[]){ "prng_src" }, .parent_hws = (const struct clk_hw*[]){
&prng_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
}, },
...@@ -1290,7 +1320,7 @@ static struct clk_rcg sdc1_src = { ...@@ -1290,7 +1320,7 @@ static struct clk_rcg sdc1_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "sdc1_src", .name = "sdc1_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
}, },
...@@ -1305,7 +1335,9 @@ static struct clk_branch sdc1_clk = { ...@@ -1305,7 +1335,9 @@ static struct clk_branch sdc1_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "sdc1_clk", .name = "sdc1_clk",
.parent_names = (const char *[]){ "sdc1_src" }, .parent_hws = (const struct clk_hw*[]){
&sdc1_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1338,7 +1370,7 @@ static struct clk_rcg sdc3_src = { ...@@ -1338,7 +1370,7 @@ static struct clk_rcg sdc3_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "sdc3_src", .name = "sdc3_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
}, },
...@@ -1353,7 +1385,9 @@ static struct clk_branch sdc3_clk = { ...@@ -1353,7 +1385,9 @@ static struct clk_branch sdc3_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "sdc3_clk", .name = "sdc3_clk",
.parent_names = (const char *[]){ "sdc3_src" }, .parent_hws = (const struct clk_hw*[]){
&sdc3_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1421,7 +1455,7 @@ static struct clk_rcg tsif_ref_src = { ...@@ -1421,7 +1455,7 @@ static struct clk_rcg tsif_ref_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "tsif_ref_src", .name = "tsif_ref_src",
.parent_names = gcc_pxo_pll8, .parent_data = gcc_pxo_pll8,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
}, },
...@@ -1436,7 +1470,9 @@ static struct clk_branch tsif_ref_clk = { ...@@ -1436,7 +1470,9 @@ static struct clk_branch tsif_ref_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "tsif_ref_clk", .name = "tsif_ref_clk",
.parent_names = (const char *[]){ "tsif_ref_src" }, .parent_hws = (const struct clk_hw*[]){
&tsif_ref_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1583,7 +1619,7 @@ static struct clk_rcg pcie_ref_src = { ...@@ -1583,7 +1619,7 @@ static struct clk_rcg pcie_ref_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pcie_ref_src", .name = "pcie_ref_src",
.parent_names = gcc_pxo_pll3, .parent_data = gcc_pxo_pll3,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -1599,7 +1635,9 @@ static struct clk_branch pcie_ref_src_clk = { ...@@ -1599,7 +1635,9 @@ static struct clk_branch pcie_ref_src_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pcie_ref_src_clk", .name = "pcie_ref_src_clk",
.parent_names = (const char *[]){ "pcie_ref_src" }, .parent_hws = (const struct clk_hw*[]){
&pcie_ref_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1675,7 +1713,7 @@ static struct clk_rcg pcie1_ref_src = { ...@@ -1675,7 +1713,7 @@ static struct clk_rcg pcie1_ref_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pcie1_ref_src", .name = "pcie1_ref_src",
.parent_names = gcc_pxo_pll3, .parent_data = gcc_pxo_pll3,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -1691,7 +1729,9 @@ static struct clk_branch pcie1_ref_src_clk = { ...@@ -1691,7 +1729,9 @@ static struct clk_branch pcie1_ref_src_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pcie1_ref_src_clk", .name = "pcie1_ref_src_clk",
.parent_names = (const char *[]){ "pcie1_ref_src" }, .parent_hws = (const struct clk_hw*[]){
&pcie1_ref_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1767,7 +1807,7 @@ static struct clk_rcg pcie2_ref_src = { ...@@ -1767,7 +1807,7 @@ static struct clk_rcg pcie2_ref_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pcie2_ref_src", .name = "pcie2_ref_src",
.parent_names = gcc_pxo_pll3, .parent_data = gcc_pxo_pll3,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -1783,7 +1823,9 @@ static struct clk_branch pcie2_ref_src_clk = { ...@@ -1783,7 +1823,9 @@ static struct clk_branch pcie2_ref_src_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pcie2_ref_src_clk", .name = "pcie2_ref_src_clk",
.parent_names = (const char *[]){ "pcie2_ref_src" }, .parent_hws = (const struct clk_hw*[]){
&pcie2_ref_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1864,7 +1906,7 @@ static struct clk_rcg sata_ref_src = { ...@@ -1864,7 +1906,7 @@ static struct clk_rcg sata_ref_src = {
.enable_mask = BIT(7), .enable_mask = BIT(7),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "sata_ref_src", .name = "sata_ref_src",
.parent_names = gcc_pxo_pll3, .parent_data = gcc_pxo_pll3,
.num_parents = 2, .num_parents = 2,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -1880,7 +1922,9 @@ static struct clk_branch sata_rxoob_clk = { ...@@ -1880,7 +1922,9 @@ static struct clk_branch sata_rxoob_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "sata_rxoob_clk", .name = "sata_rxoob_clk",
.parent_names = (const char *[]){ "sata_ref_src" }, .parent_hws = (const struct clk_hw*[]){
&sata_ref_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1896,7 +1940,9 @@ static struct clk_branch sata_pmalive_clk = { ...@@ -1896,7 +1940,9 @@ static struct clk_branch sata_pmalive_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "sata_pmalive_clk", .name = "sata_pmalive_clk",
.parent_names = (const char *[]){ "sata_ref_src" }, .parent_hws = (const struct clk_hw*[]){
&sata_ref_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -1912,7 +1958,7 @@ static struct clk_branch sata_phy_ref_clk = { ...@@ -1912,7 +1958,7 @@ static struct clk_branch sata_phy_ref_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "sata_phy_ref_clk", .name = "sata_phy_ref_clk",
.parent_names = (const char *[]){ "pxo" }, .parent_data = gcc_pxo,
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
}, },
...@@ -2001,7 +2047,7 @@ static struct clk_rcg usb30_master_clk_src = { ...@@ -2001,7 +2047,7 @@ static struct clk_rcg usb30_master_clk_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb30_master_ref_src", .name = "usb30_master_ref_src",
.parent_names = gcc_pxo_pll8_pll0, .parent_data = gcc_pxo_pll8_pll0,
.num_parents = 3, .num_parents = 3,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -2017,7 +2063,9 @@ static struct clk_branch usb30_0_branch_clk = { ...@@ -2017,7 +2063,9 @@ static struct clk_branch usb30_0_branch_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb30_0_branch_clk", .name = "usb30_0_branch_clk",
.parent_names = (const char *[]){ "usb30_master_ref_src", }, .parent_hws = (const struct clk_hw*[]){
&usb30_master_clk_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -2033,7 +2081,9 @@ static struct clk_branch usb30_1_branch_clk = { ...@@ -2033,7 +2081,9 @@ static struct clk_branch usb30_1_branch_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb30_1_branch_clk", .name = "usb30_1_branch_clk",
.parent_names = (const char *[]){ "usb30_master_ref_src", }, .parent_hws = (const struct clk_hw*[]){
&usb30_master_clk_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -2071,7 +2121,7 @@ static struct clk_rcg usb30_utmi_clk = { ...@@ -2071,7 +2121,7 @@ static struct clk_rcg usb30_utmi_clk = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb30_utmi_clk", .name = "usb30_utmi_clk",
.parent_names = gcc_pxo_pll8_pll0, .parent_data = gcc_pxo_pll8_pll0,
.num_parents = 3, .num_parents = 3,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -2087,7 +2137,9 @@ static struct clk_branch usb30_0_utmi_clk_ctl = { ...@@ -2087,7 +2137,9 @@ static struct clk_branch usb30_0_utmi_clk_ctl = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb30_0_utmi_clk_ctl", .name = "usb30_0_utmi_clk_ctl",
.parent_names = (const char *[]){ "usb30_utmi_clk", }, .parent_hws = (const struct clk_hw*[]){
&usb30_utmi_clk.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -2103,7 +2155,9 @@ static struct clk_branch usb30_1_utmi_clk_ctl = { ...@@ -2103,7 +2155,9 @@ static struct clk_branch usb30_1_utmi_clk_ctl = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb30_1_utmi_clk_ctl", .name = "usb30_1_utmi_clk_ctl",
.parent_names = (const char *[]){ "usb30_utmi_clk", }, .parent_hws = (const struct clk_hw*[]){
&usb30_utmi_clk.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -2141,7 +2195,7 @@ static struct clk_rcg usb_hs1_xcvr_clk_src = { ...@@ -2141,7 +2195,7 @@ static struct clk_rcg usb_hs1_xcvr_clk_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb_hs1_xcvr_src", .name = "usb_hs1_xcvr_src",
.parent_names = gcc_pxo_pll8_pll0, .parent_data = gcc_pxo_pll8_pll0,
.num_parents = 3, .num_parents = 3,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -2157,7 +2211,9 @@ static struct clk_branch usb_hs1_xcvr_clk = { ...@@ -2157,7 +2211,9 @@ static struct clk_branch usb_hs1_xcvr_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb_hs1_xcvr_clk", .name = "usb_hs1_xcvr_clk",
.parent_names = (const char *[]){ "usb_hs1_xcvr_src" }, .parent_hws = (const struct clk_hw*[]){
&usb_hs1_xcvr_clk_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -2205,7 +2261,7 @@ static struct clk_rcg usb_fs1_xcvr_clk_src = { ...@@ -2205,7 +2261,7 @@ static struct clk_rcg usb_fs1_xcvr_clk_src = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb_fs1_xcvr_src", .name = "usb_fs1_xcvr_src",
.parent_names = gcc_pxo_pll8_pll0, .parent_data = gcc_pxo_pll8_pll0,
.num_parents = 3, .num_parents = 3,
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
...@@ -2221,7 +2277,9 @@ static struct clk_branch usb_fs1_xcvr_clk = { ...@@ -2221,7 +2277,9 @@ static struct clk_branch usb_fs1_xcvr_clk = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb_fs1_xcvr_clk", .name = "usb_fs1_xcvr_clk",
.parent_names = (const char *[]){ "usb_fs1_xcvr_src", }, .parent_hws = (const struct clk_hw*[]){
&usb_fs1_xcvr_clk_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -2237,7 +2295,9 @@ static struct clk_branch usb_fs1_sys_clk = { ...@@ -2237,7 +2295,9 @@ static struct clk_branch usb_fs1_sys_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "usb_fs1_sys_clk", .name = "usb_fs1_sys_clk",
.parent_names = (const char *[]){ "usb_fs1_xcvr_src", }, .parent_hws = (const struct clk_hw*[]){
&usb_fs1_xcvr_clk_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
...@@ -2337,7 +2397,7 @@ static struct clk_dyn_rcg gmac_core1_src = { ...@@ -2337,7 +2397,7 @@ static struct clk_dyn_rcg gmac_core1_src = {
.enable_mask = BIT(1), .enable_mask = BIT(1),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gmac_core1_src", .name = "gmac_core1_src",
.parent_names = gcc_pxo_pll8_pll14_pll18_pll0, .parent_data = gcc_pxo_pll8_pll14_pll18_pll0,
.num_parents = 5, .num_parents = 5,
.ops = &clk_dyn_rcg_ops, .ops = &clk_dyn_rcg_ops,
}, },
...@@ -2354,8 +2414,8 @@ static struct clk_branch gmac_core1_clk = { ...@@ -2354,8 +2414,8 @@ static struct clk_branch gmac_core1_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gmac_core1_clk", .name = "gmac_core1_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gmac_core1_src", &gmac_core1_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -2409,7 +2469,7 @@ static struct clk_dyn_rcg gmac_core2_src = { ...@@ -2409,7 +2469,7 @@ static struct clk_dyn_rcg gmac_core2_src = {
.enable_mask = BIT(1), .enable_mask = BIT(1),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gmac_core2_src", .name = "gmac_core2_src",
.parent_names = gcc_pxo_pll8_pll14_pll18_pll0, .parent_data = gcc_pxo_pll8_pll14_pll18_pll0,
.num_parents = 5, .num_parents = 5,
.ops = &clk_dyn_rcg_ops, .ops = &clk_dyn_rcg_ops,
}, },
...@@ -2426,8 +2486,8 @@ static struct clk_branch gmac_core2_clk = { ...@@ -2426,8 +2486,8 @@ static struct clk_branch gmac_core2_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gmac_core2_clk", .name = "gmac_core2_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gmac_core2_src", &gmac_core2_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -2481,7 +2541,7 @@ static struct clk_dyn_rcg gmac_core3_src = { ...@@ -2481,7 +2541,7 @@ static struct clk_dyn_rcg gmac_core3_src = {
.enable_mask = BIT(1), .enable_mask = BIT(1),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gmac_core3_src", .name = "gmac_core3_src",
.parent_names = gcc_pxo_pll8_pll14_pll18_pll0, .parent_data = gcc_pxo_pll8_pll14_pll18_pll0,
.num_parents = 5, .num_parents = 5,
.ops = &clk_dyn_rcg_ops, .ops = &clk_dyn_rcg_ops,
}, },
...@@ -2498,8 +2558,8 @@ static struct clk_branch gmac_core3_clk = { ...@@ -2498,8 +2558,8 @@ static struct clk_branch gmac_core3_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gmac_core3_clk", .name = "gmac_core3_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gmac_core3_src", &gmac_core3_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -2553,7 +2613,7 @@ static struct clk_dyn_rcg gmac_core4_src = { ...@@ -2553,7 +2613,7 @@ static struct clk_dyn_rcg gmac_core4_src = {
.enable_mask = BIT(1), .enable_mask = BIT(1),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gmac_core4_src", .name = "gmac_core4_src",
.parent_names = gcc_pxo_pll8_pll14_pll18_pll0, .parent_data = gcc_pxo_pll8_pll14_pll18_pll0,
.num_parents = 5, .num_parents = 5,
.ops = &clk_dyn_rcg_ops, .ops = &clk_dyn_rcg_ops,
}, },
...@@ -2570,8 +2630,8 @@ static struct clk_branch gmac_core4_clk = { ...@@ -2570,8 +2630,8 @@ static struct clk_branch gmac_core4_clk = {
.enable_mask = BIT(4), .enable_mask = BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gmac_core4_clk", .name = "gmac_core4_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"gmac_core4_src", &gmac_core4_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -2613,7 +2673,7 @@ static struct clk_dyn_rcg nss_tcm_src = { ...@@ -2613,7 +2673,7 @@ static struct clk_dyn_rcg nss_tcm_src = {
.enable_mask = BIT(1), .enable_mask = BIT(1),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "nss_tcm_src", .name = "nss_tcm_src",
.parent_names = gcc_pxo_pll8_pll14_pll18_pll0, .parent_data = gcc_pxo_pll8_pll14_pll18_pll0,
.num_parents = 5, .num_parents = 5,
.ops = &clk_dyn_rcg_ops, .ops = &clk_dyn_rcg_ops,
}, },
...@@ -2628,8 +2688,8 @@ static struct clk_branch nss_tcm_clk = { ...@@ -2628,8 +2688,8 @@ static struct clk_branch nss_tcm_clk = {
.enable_mask = BIT(6) | BIT(4), .enable_mask = BIT(6) | BIT(4),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "nss_tcm_clk", .name = "nss_tcm_clk",
.parent_names = (const char *[]){ .parent_hws = (const struct clk_hw*[]){
"nss_tcm_src", &nss_tcm_src.clkr.hw,
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
...@@ -2691,7 +2751,7 @@ static struct clk_dyn_rcg ubi32_core1_src_clk = { ...@@ -2691,7 +2751,7 @@ static struct clk_dyn_rcg ubi32_core1_src_clk = {
.enable_mask = BIT(1), .enable_mask = BIT(1),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "ubi32_core1_src_clk", .name = "ubi32_core1_src_clk",
.parent_names = gcc_pxo_pll8_pll14_pll18_pll0, .parent_data = gcc_pxo_pll8_pll14_pll18_pll0,
.num_parents = 5, .num_parents = 5,
.ops = &clk_dyn_rcg_ops, .ops = &clk_dyn_rcg_ops,
.flags = CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE, .flags = CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE,
...@@ -2744,7 +2804,7 @@ static struct clk_dyn_rcg ubi32_core2_src_clk = { ...@@ -2744,7 +2804,7 @@ static struct clk_dyn_rcg ubi32_core2_src_clk = {
.enable_mask = BIT(1), .enable_mask = BIT(1),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "ubi32_core2_src_clk", .name = "ubi32_core2_src_clk",
.parent_names = gcc_pxo_pll8_pll14_pll18_pll0, .parent_data = gcc_pxo_pll8_pll14_pll18_pll0,
.num_parents = 5, .num_parents = 5,
.ops = &clk_dyn_rcg_ops, .ops = &clk_dyn_rcg_ops,
.flags = CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE, .flags = CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE,
......
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