Skip to content

Commit 1c16a7b

Browse files
Imran Shaikandersson
authored andcommitted
clk: qcom: gcc-qdu1000: Update the RCGs ops
The clock RCGs are required to be parked at safe clock source(XO) during disable as per the hardware expectation and clk_rcg2_shared_ops are the closest implementation for the same. Hence update the clock RCG ops to clk_rcg2_shared_ops. Signed-off-by: Imran Shaik <[email protected]> Reviewed-by: Konrad Dybcio <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent baa3165 commit 1c16a7b

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

drivers/clk/qcom/gcc-qdu1000.c

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ static struct clk_rcg2 gcc_aggre_noc_ecpri_dma_clk_src = {
475475
.name = "gcc_aggre_noc_ecpri_dma_clk_src",
476476
.parent_data = gcc_parent_data_4,
477477
.num_parents = ARRAY_SIZE(gcc_parent_data_4),
478-
.ops = &clk_rcg2_ops,
478+
.ops = &clk_rcg2_shared_ops,
479479
},
480480
};
481481

@@ -495,7 +495,7 @@ static struct clk_rcg2 gcc_aggre_noc_ecpri_gsi_clk_src = {
495495
.name = "gcc_aggre_noc_ecpri_gsi_clk_src",
496496
.parent_data = gcc_parent_data_5,
497497
.num_parents = ARRAY_SIZE(gcc_parent_data_5),
498-
.ops = &clk_rcg2_ops,
498+
.ops = &clk_rcg2_shared_ops,
499499
},
500500
};
501501

@@ -514,7 +514,7 @@ static struct clk_rcg2 gcc_gp1_clk_src = {
514514
.name = "gcc_gp1_clk_src",
515515
.parent_data = gcc_parent_data_1,
516516
.num_parents = ARRAY_SIZE(gcc_parent_data_1),
517-
.ops = &clk_rcg2_ops,
517+
.ops = &clk_rcg2_shared_ops,
518518
},
519519
};
520520

@@ -528,7 +528,7 @@ static struct clk_rcg2 gcc_gp2_clk_src = {
528528
.name = "gcc_gp2_clk_src",
529529
.parent_data = gcc_parent_data_1,
530530
.num_parents = ARRAY_SIZE(gcc_parent_data_1),
531-
.ops = &clk_rcg2_ops,
531+
.ops = &clk_rcg2_shared_ops,
532532
},
533533
};
534534

@@ -542,7 +542,7 @@ static struct clk_rcg2 gcc_gp3_clk_src = {
542542
.name = "gcc_gp3_clk_src",
543543
.parent_data = gcc_parent_data_1,
544544
.num_parents = ARRAY_SIZE(gcc_parent_data_1),
545-
.ops = &clk_rcg2_ops,
545+
.ops = &clk_rcg2_shared_ops,
546546
},
547547
};
548548

@@ -561,7 +561,7 @@ static struct clk_rcg2 gcc_pcie_0_aux_clk_src = {
561561
.name = "gcc_pcie_0_aux_clk_src",
562562
.parent_data = gcc_parent_data_3,
563563
.num_parents = ARRAY_SIZE(gcc_parent_data_3),
564-
.ops = &clk_rcg2_ops,
564+
.ops = &clk_rcg2_shared_ops,
565565
},
566566
};
567567

@@ -581,7 +581,7 @@ static struct clk_rcg2 gcc_pcie_0_phy_rchng_clk_src = {
581581
.name = "gcc_pcie_0_phy_rchng_clk_src",
582582
.parent_data = gcc_parent_data_0,
583583
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
584-
.ops = &clk_rcg2_ops,
584+
.ops = &clk_rcg2_shared_ops,
585585
},
586586
};
587587

@@ -600,7 +600,7 @@ static struct clk_rcg2 gcc_pdm2_clk_src = {
600600
.name = "gcc_pdm2_clk_src",
601601
.parent_data = gcc_parent_data_0,
602602
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
603-
.ops = &clk_rcg2_ops,
603+
.ops = &clk_rcg2_shared_ops,
604604
},
605605
};
606606

@@ -622,7 +622,7 @@ static struct clk_init_data gcc_qupv3_wrap0_s0_clk_src_init = {
622622
.name = "gcc_qupv3_wrap0_s0_clk_src",
623623
.parent_data = gcc_parent_data_0,
624624
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
625-
.ops = &clk_rcg2_ops,
625+
.ops = &clk_rcg2_shared_ops,
626626
};
627627

628628
static struct clk_rcg2 gcc_qupv3_wrap0_s0_clk_src = {
@@ -638,7 +638,7 @@ static struct clk_init_data gcc_qupv3_wrap0_s1_clk_src_init = {
638638
.name = "gcc_qupv3_wrap0_s1_clk_src",
639639
.parent_data = gcc_parent_data_0,
640640
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
641-
.ops = &clk_rcg2_ops,
641+
.ops = &clk_rcg2_shared_ops,
642642
};
643643

644644
static struct clk_rcg2 gcc_qupv3_wrap0_s1_clk_src = {
@@ -654,7 +654,7 @@ static struct clk_init_data gcc_qupv3_wrap0_s2_clk_src_init = {
654654
.name = "gcc_qupv3_wrap0_s2_clk_src",
655655
.parent_data = gcc_parent_data_0,
656656
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
657-
.ops = &clk_rcg2_ops,
657+
.ops = &clk_rcg2_shared_ops,
658658
};
659659

660660
static struct clk_rcg2 gcc_qupv3_wrap0_s2_clk_src = {
@@ -670,7 +670,7 @@ static struct clk_init_data gcc_qupv3_wrap0_s3_clk_src_init = {
670670
.name = "gcc_qupv3_wrap0_s3_clk_src",
671671
.parent_data = gcc_parent_data_0,
672672
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
673-
.ops = &clk_rcg2_ops,
673+
.ops = &clk_rcg2_shared_ops,
674674
};
675675

676676
static struct clk_rcg2 gcc_qupv3_wrap0_s3_clk_src = {
@@ -686,7 +686,7 @@ static struct clk_init_data gcc_qupv3_wrap0_s4_clk_src_init = {
686686
.name = "gcc_qupv3_wrap0_s4_clk_src",
687687
.parent_data = gcc_parent_data_0,
688688
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
689-
.ops = &clk_rcg2_ops,
689+
.ops = &clk_rcg2_shared_ops,
690690
};
691691

692692
static struct clk_rcg2 gcc_qupv3_wrap0_s4_clk_src = {
@@ -707,7 +707,7 @@ static struct clk_init_data gcc_qupv3_wrap0_s5_clk_src_init = {
707707
.name = "gcc_qupv3_wrap0_s5_clk_src",
708708
.parent_data = gcc_parent_data_0,
709709
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
710-
.ops = &clk_rcg2_ops,
710+
.ops = &clk_rcg2_shared_ops,
711711
};
712712

713713
static struct clk_rcg2 gcc_qupv3_wrap0_s5_clk_src = {
@@ -723,7 +723,7 @@ static struct clk_init_data gcc_qupv3_wrap0_s6_clk_src_init = {
723723
.name = "gcc_qupv3_wrap0_s6_clk_src",
724724
.parent_data = gcc_parent_data_0,
725725
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
726-
.ops = &clk_rcg2_ops,
726+
.ops = &clk_rcg2_shared_ops,
727727
};
728728

729729
static struct clk_rcg2 gcc_qupv3_wrap0_s6_clk_src = {
@@ -739,7 +739,7 @@ static struct clk_init_data gcc_qupv3_wrap0_s7_clk_src_init = {
739739
.name = "gcc_qupv3_wrap0_s7_clk_src",
740740
.parent_data = gcc_parent_data_0,
741741
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
742-
.ops = &clk_rcg2_ops,
742+
.ops = &clk_rcg2_shared_ops,
743743
};
744744

745745
static struct clk_rcg2 gcc_qupv3_wrap0_s7_clk_src = {
@@ -755,7 +755,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s0_clk_src_init = {
755755
.name = "gcc_qupv3_wrap1_s0_clk_src",
756756
.parent_data = gcc_parent_data_0,
757757
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
758-
.ops = &clk_rcg2_ops,
758+
.ops = &clk_rcg2_shared_ops,
759759
};
760760

761761
static struct clk_rcg2 gcc_qupv3_wrap1_s0_clk_src = {
@@ -771,7 +771,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s1_clk_src_init = {
771771
.name = "gcc_qupv3_wrap1_s1_clk_src",
772772
.parent_data = gcc_parent_data_0,
773773
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
774-
.ops = &clk_rcg2_ops,
774+
.ops = &clk_rcg2_shared_ops,
775775
};
776776

777777
static struct clk_rcg2 gcc_qupv3_wrap1_s1_clk_src = {
@@ -787,7 +787,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s2_clk_src_init = {
787787
.name = "gcc_qupv3_wrap1_s2_clk_src",
788788
.parent_data = gcc_parent_data_0,
789789
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
790-
.ops = &clk_rcg2_ops,
790+
.ops = &clk_rcg2_shared_ops,
791791
};
792792

793793
static struct clk_rcg2 gcc_qupv3_wrap1_s2_clk_src = {
@@ -803,7 +803,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s3_clk_src_init = {
803803
.name = "gcc_qupv3_wrap1_s3_clk_src",
804804
.parent_data = gcc_parent_data_0,
805805
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
806-
.ops = &clk_rcg2_ops,
806+
.ops = &clk_rcg2_shared_ops,
807807
};
808808

809809
static struct clk_rcg2 gcc_qupv3_wrap1_s3_clk_src = {
@@ -819,7 +819,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s4_clk_src_init = {
819819
.name = "gcc_qupv3_wrap1_s4_clk_src",
820820
.parent_data = gcc_parent_data_0,
821821
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
822-
.ops = &clk_rcg2_ops,
822+
.ops = &clk_rcg2_shared_ops,
823823
};
824824

825825
static struct clk_rcg2 gcc_qupv3_wrap1_s4_clk_src = {
@@ -835,7 +835,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s5_clk_src_init = {
835835
.name = "gcc_qupv3_wrap1_s5_clk_src",
836836
.parent_data = gcc_parent_data_0,
837837
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
838-
.ops = &clk_rcg2_ops,
838+
.ops = &clk_rcg2_shared_ops,
839839
};
840840

841841
static struct clk_rcg2 gcc_qupv3_wrap1_s5_clk_src = {
@@ -851,7 +851,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s6_clk_src_init = {
851851
.name = "gcc_qupv3_wrap1_s6_clk_src",
852852
.parent_data = gcc_parent_data_0,
853853
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
854-
.ops = &clk_rcg2_ops,
854+
.ops = &clk_rcg2_shared_ops,
855855
};
856856

857857
static struct clk_rcg2 gcc_qupv3_wrap1_s6_clk_src = {
@@ -867,7 +867,7 @@ static struct clk_init_data gcc_qupv3_wrap1_s7_clk_src_init = {
867867
.name = "gcc_qupv3_wrap1_s7_clk_src",
868868
.parent_data = gcc_parent_data_0,
869869
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
870-
.ops = &clk_rcg2_ops,
870+
.ops = &clk_rcg2_shared_ops,
871871
};
872872

873873
static struct clk_rcg2 gcc_qupv3_wrap1_s7_clk_src = {
@@ -936,7 +936,7 @@ static struct clk_rcg2 gcc_sm_bus_xo_clk_src = {
936936
.name = "gcc_sm_bus_xo_clk_src",
937937
.parent_data = gcc_parent_data_2,
938938
.num_parents = ARRAY_SIZE(gcc_parent_data_2),
939-
.ops = &clk_rcg2_ops,
939+
.ops = &clk_rcg2_shared_ops,
940940
},
941941
};
942942

@@ -955,7 +955,7 @@ static struct clk_rcg2 gcc_tsc_clk_src = {
955955
.name = "gcc_tsc_clk_src",
956956
.parent_data = gcc_parent_data_9,
957957
.num_parents = ARRAY_SIZE(gcc_parent_data_9),
958-
.ops = &clk_rcg2_ops,
958+
.ops = &clk_rcg2_shared_ops,
959959
},
960960
};
961961

@@ -975,7 +975,7 @@ static struct clk_rcg2 gcc_usb30_prim_master_clk_src = {
975975
.name = "gcc_usb30_prim_master_clk_src",
976976
.parent_data = gcc_parent_data_0,
977977
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
978-
.ops = &clk_rcg2_ops,
978+
.ops = &clk_rcg2_shared_ops,
979979
},
980980
};
981981

@@ -989,7 +989,7 @@ static struct clk_rcg2 gcc_usb30_prim_mock_utmi_clk_src = {
989989
.name = "gcc_usb30_prim_mock_utmi_clk_src",
990990
.parent_data = gcc_parent_data_0,
991991
.num_parents = ARRAY_SIZE(gcc_parent_data_0),
992-
.ops = &clk_rcg2_ops,
992+
.ops = &clk_rcg2_shared_ops,
993993
},
994994
};
995995

@@ -1003,7 +1003,7 @@ static struct clk_rcg2 gcc_usb3_prim_phy_aux_clk_src = {
10031003
.name = "gcc_usb3_prim_phy_aux_clk_src",
10041004
.parent_data = gcc_parent_data_3,
10051005
.num_parents = ARRAY_SIZE(gcc_parent_data_3),
1006-
.ops = &clk_rcg2_ops,
1006+
.ops = &clk_rcg2_shared_ops,
10071007
},
10081008
};
10091009

0 commit comments

Comments
 (0)