Add Misc GCC clock driver support for SC7180
v2 cover Add Misc GCC clock driver support for SC7180
[v2]
* Update to use ARRAY_SIZE instead of hard-coded values for num_parents. Also add the fixes tag.
[v1]
* Add a new frequency of 51.2MHz for QUP clock.
* Add support for gcc_sec_ctrl_clk_src RCG for client to be able to request various frequencies.
Taniya Das (3):
clk: qcom: gcc: Add support for a new frequency for SC7180
dt-bindings: clock: Add gcc_sec_ctrl_clk_src clock ID
clk: qcom: gcc: Add support for Secure control source clock
drivers/clk/qcom/gcc-sc7180.c | 94 ++++++++++++++++++----------- include/dt-bindings/clock/qcom,gcc-sc7180.h | 1 + 2 files changed, 59 insertions(+), 36 deletions(-)
--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
PATCH v2 1/3 clk: qcom: gcc: Add support for a new frequency for SC7180
There is a requirement to support 51.2MHz from GPLL6 for qup clocks, thus update the frequency table and parent data/map to use the GPLL6 source PLL.
--- drivers/clk/qcom/gcc-sc7180.c | 73 ++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 36 deletions(-)
drivers/clk/qcom/gcc-sc7180.c +37 -36
@@ -390,6 +390,7 @@ static const struct freq_tbl ftbl_gcc_qupv3_wrap0_s0_clk_src[] = {F (29491200 ,P_GPLL0_OUT_EVEN ,1 ,1536 ,15625 ),F (32000000 ,P_GPLL0_OUT_EVEN ,1 ,8 ,75 ),F (48000000 ,P_GPLL0_OUT_EVEN ,1 ,4 ,25 ), +F (51200000 ,P_GPLL6_OUT_MAIN ,7.5 ,0 ,0 ),F (64000000 ,P_GPLL0_OUT_EVEN ,1 ,16 ,75 ),F (75000000 ,P_GPLL0_OUT_EVEN ,4 ,0 ,0 ), F(80000000, P_GPLL0_OUT_EVEN, 1, 4, 15),
@@ -405,8 +406,8 @@ static const struct freq_tbl ftbl_gcc_qupv3_wrap0_s0_clk_src[] = {static struct clk_init_data gcc_qupv3_wrap0_s0_clk_src_init = { .name ="gcc_qupv3_wrap0_s0_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -414,15 +415,15 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s0_clk_src = { .cmd_rcgr = 0x17034, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap0_s0_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap0_s1_clk_src_init = { .name ="gcc_qupv3_wrap0_s1_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -430,15 +431,15 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s1_clk_src = { .cmd_rcgr = 0x17164, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap0_s1_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap0_s2_clk_src_init = { .name ="gcc_qupv3_wrap0_s2_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -446,15 +447,15 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s2_clk_src = { .cmd_rcgr = 0x17294, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap0_s2_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap0_s3_clk_src_init = { .name ="gcc_qupv3_wrap0_s3_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -462,15 +463,15 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s3_clk_src = { .cmd_rcgr = 0x173c4, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap0_s3_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap0_s4_clk_src_init = { .name ="gcc_qupv3_wrap0_s4_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -478,15 +479,15 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s4_clk_src = { .cmd_rcgr = 0x174f4, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap0_s4_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap0_s5_clk_src_init = { .name ="gcc_qupv3_wrap0_s5_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -494,15 +495,15 @@ static struct clk_rcg2 gcc_qupv3_wrap0_s5_clk_src = { .cmd_rcgr = 0x17624, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap0_s5_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap1_s0_clk_src_init = { .name ="gcc_qupv3_wrap1_s0_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -510,15 +511,15 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s0_clk_src = { .cmd_rcgr = 0x18018, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap1_s0_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap1_s1_clk_src_init = { .name ="gcc_qupv3_wrap1_s1_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -526,15 +527,15 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s1_clk_src = { .cmd_rcgr = 0x18148, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap1_s1_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap1_s2_clk_src_init = { .name ="gcc_qupv3_wrap1_s2_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -542,15 +543,15 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s2_clk_src = { .cmd_rcgr = 0x18278, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap1_s2_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap1_s3_clk_src_init = { .name ="gcc_qupv3_wrap1_s3_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -558,15 +559,15 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s3_clk_src = { .cmd_rcgr = 0x183a8, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap1_s3_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap1_s4_clk_src_init = { .name ="gcc_qupv3_wrap1_s4_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -574,15 +575,15 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s4_clk_src = { .cmd_rcgr = 0x184d8, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap1_s4_clk_src_init, };static struct clk_init_data gcc_qupv3_wrap1_s5_clk_src_init = { .name ="gcc_qupv3_wrap1_s5_clk_src" , - .parent_data = gcc_parent_data_0, - .num_parents =4 , + .parent_data = gcc_parent_data_1, + .num_parents =ARRAY_SIZE (gcc_parent_data_1), .ops = &clk_rcg2_ops, };
@@ -590,7 +591,7 @@ static struct clk_rcg2 gcc_qupv3_wrap1_s5_clk_src = { .cmd_rcgr = 0x18608, .mnd_width = 16, .hid_width = 5, - .parent_map = gcc_parent_map_0, + .parent_map = gcc_parent_map_1, .freq_tbl = ftbl_gcc_qupv3_wrap0_s0_clk_src, .clkr.hw.init = &gcc_qupv3_wrap1_s5_clk_src_init, };
--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Re: [PATCH v2 1/3] clk: qcom: gcc: Add support for a new frequency for SC7180
Quoting Taniya Das (2020-05-17 03:04:19)
Quoted 7 lines
There is a requirement to support 51.2MHz from GPLL6 for qup clocks, thus update the frequency table and parent data/map to use the GPLL6 source PLL.
Fixes 17269568f7267 ("clk: qcom: Add Global Clock controller (GCC) driver for SC7180")Signed-off-by Taniya Das <[email protected]>---
Applied to clk-next
PATCH v2 2/3 dt-bindings: clock: Add gcc_sec_ctrl_clk_src clock ID
In reply to Taniya DasThe gcc_sec_ctrl_clk_src clock is required to be controlled by the secure controller driver.
--- include/dt-bindings/clock/qcom,gcc-sc7180.h | 1 + 1 file changed, 1 insertion(+)
include/dt-bindings/clock/qcom,gcc-sc7180.h +1 -0
@@ -137,6 +137,7 @@#define GCC_MSS_NAV_AXI_CLK 127#define GCC_MSS_Q6_MEMNOC_AXI_CLK 128#define GCC_MSS_SNOC_AXI_CLK 129 +#define GCC_SEC_CTRL_CLK_SRC 130/* GCC resets */ #define GCC_QUSB2PHY_PRIM_BCR 0
Signature · 2 lines
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Re: [PATCH v2 2/3] dt-bindings: clock: Add gcc_sec_ctrl_clk_src clock ID
Quoting Taniya Das (2020-05-17 03:04:20)
Quoted 5 lines
The
gcc_sec_ctrl_clk_srcclock is required to be controlled by the secure controller driver.Signed-off-by Taniya Das <[email protected]>---
Applied to clk-next
PATCH v2 3/3 clk: qcom: gcc: Add support for Secure control source clock
In reply to Taniya DasThe secure controller driver requires to request for various frequencies on the source clock, thus add support for the same.
--- drivers/clk/qcom/gcc-sc7180.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/clk/qcom/gcc-sc7180.c +21 -0
@@ -817,6 +817,26 @@ static struct clk_rcg2 gcc_usb3_prim_phy_aux_clk_src = { }, }; +static const struct freq_tbl ftbl_gcc_sec_ctrl_clk_src[] = { +F (4800000 ,P_BI_TCXO ,4 ,0 ,0 ), +F (19200000 ,P_BI_TCXO ,1 ,0 ,0 ), + { } +}; + +static struct clk_rcg2 gcc_sec_ctrl_clk_src = { + .cmd_rcgr =0x3d030 , + .mnd_width =0 , + .hid_width =5 , + .parent_map = gcc_parent_map_3, + .freq_tbl = ftbl_gcc_sec_ctrl_clk_src, + .clkr.hw.init = &(struct clk_init_data ){ + .name ="gcc_sec_ctrl_clk_src" , + .parent_data = gcc_parent_data_3, + .num_parents =ARRAY_SIZE (gcc_parent_data_3), + .ops = &clk_rcg2_ops, + }, +}; +static struct clk_branch gcc_aggre_ufs_phy_axi_clk = { .halt_reg =0x82024 , .halt_check =BRANCH_HALT_DELAY ,
@@ -2407,6 +2427,7 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_MSS_NAV_AXI_CLK] = &gcc_mss_nav_axi_clk.clkr, [GCC_MSS_Q6_MEMNOC_AXI_CLK] = &gcc_mss_q6_memnoc_axi_clk.clkr, [GCC_MSS_SNOC_AXI_CLK] = &gcc_mss_snoc_axi_clk.clkr, + [GCC_SEC_CTRL_CLK_SRC] = &gcc_sec_ctrl_clk_src.clkr, };static const struct qcom_reset_map gcc_sc7180_resets[] = {
Signature · 2 lines
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Re: [PATCH v2 3/3] clk: qcom: gcc: Add support for Secure control source clock
Quoting Taniya Das (2020-05-17 03:04:21)
Quoted 5 lines
The secure controller driver requires to request for various frequencies on the source clock, thus add support for the same.
Signed-off-by Taniya Das <[email protected]>---
Applied to clk-next