@@ -1635,42 +1635,6 @@ static struct clk_branch gcc_mdio_slave_ahb_clk = {
16351635 },
16361636};
16371637
1638- static struct clk_branch gcc_mem_noc_q6_axi_clk = {
1639- .halt_reg = 0x19010 ,
1640- .halt_check = BRANCH_HALT ,
1641- .clkr = {
1642- .enable_reg = 0x19010 ,
1643- .enable_mask = BIT (0 ),
1644- .hw .init = & (const struct clk_init_data ) {
1645- .name = "gcc_mem_noc_q6_axi_clk" ,
1646- .parent_hws = (const struct clk_hw * []) {
1647- & gcc_q6_axim_clk_src .clkr .hw ,
1648- },
1649- .num_parents = 1 ,
1650- .flags = CLK_SET_RATE_PARENT ,
1651- .ops = & clk_branch2_ops ,
1652- },
1653- },
1654- };
1655-
1656- static struct clk_branch gcc_mem_noc_ts_clk = {
1657- .halt_reg = 0x19028 ,
1658- .halt_check = BRANCH_HALT_VOTED ,
1659- .clkr = {
1660- .enable_reg = 0x19028 ,
1661- .enable_mask = BIT (0 ),
1662- .hw .init = & (const struct clk_init_data ) {
1663- .name = "gcc_mem_noc_ts_clk" ,
1664- .parent_hws = (const struct clk_hw * []) {
1665- & gcc_qdss_tsctr_div8_clk_src .hw ,
1666- },
1667- .num_parents = 1 ,
1668- .flags = CLK_SET_RATE_PARENT ,
1669- .ops = & clk_branch2_ops ,
1670- },
1671- },
1672- };
1673-
16741638static struct clk_branch gcc_nss_ts_clk = {
16751639 .halt_reg = 0x17018 ,
16761640 .halt_check = BRANCH_HALT_VOTED ,
@@ -3339,42 +3303,6 @@ static struct clk_branch gcc_nssnoc_pcnoc_1_clk = {
33393303 },
33403304};
33413305
3342- static struct clk_branch gcc_mem_noc_ahb_clk = {
3343- .halt_reg = 0x1900c ,
3344- .halt_check = BRANCH_HALT ,
3345- .clkr = {
3346- .enable_reg = 0x1900c ,
3347- .enable_mask = BIT (0 ),
3348- .hw .init = & (const struct clk_init_data ) {
3349- .name = "gcc_mem_noc_ahb_clk" ,
3350- .parent_hws = (const struct clk_hw * []) {
3351- & gcc_pcnoc_bfdcd_clk_src .clkr .hw ,
3352- },
3353- .num_parents = 1 ,
3354- .flags = CLK_SET_RATE_PARENT ,
3355- .ops = & clk_branch2_ops ,
3356- },
3357- },
3358- };
3359-
3360- static struct clk_branch gcc_mem_noc_apss_axi_clk = {
3361- .halt_reg = 0x1901c ,
3362- .halt_check = BRANCH_HALT_VOTED ,
3363- .clkr = {
3364- .enable_reg = 0xb004 ,
3365- .enable_mask = BIT (6 ),
3366- .hw .init = & (const struct clk_init_data ) {
3367- .name = "gcc_mem_noc_apss_axi_clk" ,
3368- .parent_hws = (const struct clk_hw * []) {
3369- & gcc_apss_axi_clk_src .clkr .hw ,
3370- },
3371- .num_parents = 1 ,
3372- .flags = CLK_SET_RATE_PARENT ,
3373- .ops = & clk_branch2_ops ,
3374- },
3375- },
3376- };
3377-
33783306static struct clk_regmap_div gcc_snoc_qosgen_extref_div_clk_src = {
33793307 .reg = 0x2e010 ,
33803308 .shift = 0 ,
@@ -3390,24 +3318,6 @@ static struct clk_regmap_div gcc_snoc_qosgen_extref_div_clk_src = {
33903318 },
33913319};
33923320
3393- static struct clk_branch gcc_mem_noc_qosgen_extref_clk = {
3394- .halt_reg = 0x19024 ,
3395- .halt_check = BRANCH_HALT ,
3396- .clkr = {
3397- .enable_reg = 0x19024 ,
3398- .enable_mask = BIT (0 ),
3399- .hw .init = & (const struct clk_init_data ) {
3400- .name = "gcc_mem_noc_qosgen_extref_clk" ,
3401- .parent_hws = (const struct clk_hw * []) {
3402- & gcc_snoc_qosgen_extref_div_clk_src .clkr .hw ,
3403- },
3404- .num_parents = 1 ,
3405- .flags = CLK_SET_RATE_PARENT ,
3406- .ops = & clk_branch2_ops ,
3407- },
3408- },
3409- };
3410-
34113321static struct clk_regmap * gcc_ipq5332_clocks [] = {
34123322 [GPLL0_MAIN ] = & gpll0_main .clkr ,
34133323 [GPLL0 ] = & gpll0 .clkr ,
@@ -3451,8 +3361,6 @@ static struct clk_regmap *gcc_ipq5332_clocks[] = {
34513361 [GCC_LPASS_SWAY_CLK_SRC ] = & gcc_lpass_sway_clk_src .clkr ,
34523362 [GCC_MDIO_AHB_CLK ] = & gcc_mdio_ahb_clk .clkr ,
34533363 [GCC_MDIO_SLAVE_AHB_CLK ] = & gcc_mdio_slave_ahb_clk .clkr ,
3454- [GCC_MEM_NOC_Q6_AXI_CLK ] = & gcc_mem_noc_q6_axi_clk .clkr ,
3455- [GCC_MEM_NOC_TS_CLK ] = & gcc_mem_noc_ts_clk .clkr ,
34563364 [GCC_NSS_TS_CLK ] = & gcc_nss_ts_clk .clkr ,
34573365 [GCC_NSS_TS_CLK_SRC ] = & gcc_nss_ts_clk_src .clkr ,
34583366 [GCC_NSSCC_CLK ] = & gcc_nsscc_clk .clkr ,
@@ -3573,10 +3481,7 @@ static struct clk_regmap *gcc_ipq5332_clocks[] = {
35733481 [GCC_XO_DIV4_CLK ] = & gcc_xo_div4_clk .clkr ,
35743482 [GCC_IM_SLEEP_CLK ] = & gcc_im_sleep_clk .clkr ,
35753483 [GCC_NSSNOC_PCNOC_1_CLK ] = & gcc_nssnoc_pcnoc_1_clk .clkr ,
3576- [GCC_MEM_NOC_AHB_CLK ] = & gcc_mem_noc_ahb_clk .clkr ,
3577- [GCC_MEM_NOC_APSS_AXI_CLK ] = & gcc_mem_noc_apss_axi_clk .clkr ,
35783484 [GCC_SNOC_QOSGEN_EXTREF_DIV_CLK_SRC ] = & gcc_snoc_qosgen_extref_div_clk_src .clkr ,
3579- [GCC_MEM_NOC_QOSGEN_EXTREF_CLK ] = & gcc_mem_noc_qosgen_extref_clk .clkr ,
35803485 [GCC_PCIE3X2_PIPE_CLK_SRC ] = & gcc_pcie3x2_pipe_clk_src .clkr ,
35813486 [GCC_PCIE3X1_0_PIPE_CLK_SRC ] = & gcc_pcie3x1_0_pipe_clk_src .clkr ,
35823487 [GCC_PCIE3X1_1_PIPE_CLK_SRC ] = & gcc_pcie3x1_1_pipe_clk_src .clkr ,
0 commit comments