@@ -207,28 +207,6 @@ static const struct clk_parent_data gcc_parents_7[] = {
207207 { .hw = & gpll0_out_even .clkr .hw },
208208};
209209
210- static const struct freq_tbl ftbl_gcc_cpuss_ahb_clk_src [] = {
211- F (19200000 , P_BI_TCXO , 1 , 0 , 0 ),
212- F (50000000 , P_GPLL0_OUT_MAIN , 12 , 0 , 0 ),
213- F (100000000 , P_GPLL0_OUT_MAIN , 6 , 0 , 0 ),
214- { }
215- };
216-
217- static struct clk_rcg2 gcc_cpuss_ahb_clk_src = {
218- .cmd_rcgr = 0x48014 ,
219- .mnd_width = 0 ,
220- .hid_width = 5 ,
221- .parent_map = gcc_parent_map_0 ,
222- .freq_tbl = ftbl_gcc_cpuss_ahb_clk_src ,
223- .clkr .hw .init = & (struct clk_init_data ){
224- .name = "gcc_cpuss_ahb_clk_src" ,
225- .parent_data = gcc_parents_0 ,
226- .num_parents = ARRAY_SIZE (gcc_parents_0 ),
227- .flags = CLK_SET_RATE_PARENT ,
228- .ops = & clk_rcg2_ops ,
229- },
230- };
231-
232210static const struct freq_tbl ftbl_gcc_emac_ptp_clk_src [] = {
233211 F (19200000 , P_BI_TCXO , 1 , 0 , 0 ),
234212 F (50000000 , P_GPLL0_OUT_EVEN , 6 , 0 , 0 ),
@@ -1361,24 +1339,6 @@ static struct clk_branch gcc_cfg_noc_usb3_sec_axi_clk = {
13611339 },
13621340};
13631341
1364- static struct clk_branch gcc_cpuss_ahb_clk = {
1365- .halt_reg = 0x48000 ,
1366- .halt_check = BRANCH_HALT_VOTED ,
1367- .clkr = {
1368- .enable_reg = 0x52004 ,
1369- .enable_mask = BIT (21 ),
1370- .hw .init = & (struct clk_init_data ){
1371- .name = "gcc_cpuss_ahb_clk" ,
1372- .parent_hws = (const struct clk_hw * []){
1373- & gcc_cpuss_ahb_clk_src .clkr .hw },
1374- .num_parents = 1 ,
1375- /* required for cpuss */
1376- .flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT ,
1377- .ops = & clk_branch2_ops ,
1378- },
1379- },
1380- };
1381-
13821342static struct clk_branch gcc_cpuss_dvm_bus_clk = {
13831343 .halt_reg = 0x48190 ,
13841344 .halt_check = BRANCH_HALT ,
@@ -2685,24 +2645,6 @@ static struct clk_branch gcc_sdcc4_apps_clk = {
26852645 },
26862646};
26872647
2688- static struct clk_branch gcc_sys_noc_cpuss_ahb_clk = {
2689- .halt_reg = 0x4819c ,
2690- .halt_check = BRANCH_HALT_VOTED ,
2691- .clkr = {
2692- .enable_reg = 0x52004 ,
2693- .enable_mask = BIT (0 ),
2694- .hw .init = & (struct clk_init_data ){
2695- .name = "gcc_sys_noc_cpuss_ahb_clk" ,
2696- .parent_hws = (const struct clk_hw * []){
2697- & gcc_cpuss_ahb_clk_src .clkr .hw },
2698- .num_parents = 1 ,
2699- /* required for cpuss */
2700- .flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT ,
2701- .ops = & clk_branch2_ops ,
2702- },
2703- },
2704- };
2705-
27062648static struct clk_branch gcc_tsif_ahb_clk = {
27072649 .halt_reg = 0x36004 ,
27082650 .halt_check = BRANCH_HALT ,
@@ -3550,8 +3492,6 @@ static struct clk_regmap *gcc_sm8150_clocks[] = {
35503492 [GCC_CAMERA_XO_CLK ] = & gcc_camera_xo_clk .clkr ,
35513493 [GCC_CFG_NOC_USB3_PRIM_AXI_CLK ] = & gcc_cfg_noc_usb3_prim_axi_clk .clkr ,
35523494 [GCC_CFG_NOC_USB3_SEC_AXI_CLK ] = & gcc_cfg_noc_usb3_sec_axi_clk .clkr ,
3553- [GCC_CPUSS_AHB_CLK ] = & gcc_cpuss_ahb_clk .clkr ,
3554- [GCC_CPUSS_AHB_CLK_SRC ] = & gcc_cpuss_ahb_clk_src .clkr ,
35553495 [GCC_CPUSS_DVM_BUS_CLK ] = & gcc_cpuss_dvm_bus_clk .clkr ,
35563496 [GCC_CPUSS_GNOC_CLK ] = & gcc_cpuss_gnoc_clk .clkr ,
35573497 [GCC_CPUSS_RBCPR_CLK ] = & gcc_cpuss_rbcpr_clk .clkr ,
@@ -3669,7 +3609,6 @@ static struct clk_regmap *gcc_sm8150_clocks[] = {
36693609 [GCC_SDCC4_AHB_CLK ] = & gcc_sdcc4_ahb_clk .clkr ,
36703610 [GCC_SDCC4_APPS_CLK ] = & gcc_sdcc4_apps_clk .clkr ,
36713611 [GCC_SDCC4_APPS_CLK_SRC ] = & gcc_sdcc4_apps_clk_src .clkr ,
3672- [GCC_SYS_NOC_CPUSS_AHB_CLK ] = & gcc_sys_noc_cpuss_ahb_clk .clkr ,
36733612 [GCC_TSIF_AHB_CLK ] = & gcc_tsif_ahb_clk .clkr ,
36743613 [GCC_TSIF_INACTIVITY_TIMERS_CLK ] = & gcc_tsif_inactivity_timers_clk .clkr ,
36753614 [GCC_TSIF_REF_CLK ] = & gcc_tsif_ref_clk .clkr ,
0 commit comments