Skip to content

Commit 579856a

Browse files
committed
ARM: dts: am3: Update clksel clocks to use reg instead of ti,bit-shift
For the clksel clocks we are still using the legacy ti,bit-shift property instead of the standard reg property. We can now use the reg property, so let's do that for the clksel clocks. To add the reg property, we switch to use #address-cells = <1>. Signed-off-by: Tony Lindgren <[email protected]>
1 parent 4a5917c commit 579856a

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

arch/arm/boot/dts/ti/omap/am33xx-clocks.dtsi

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -108,30 +108,31 @@
108108
compatible = "ti,clksel";
109109
reg = <0x664>;
110110
#clock-cells = <2>;
111-
#address-cells = <0>;
111+
#address-cells = <1>;
112+
#size-cells = <0>;
112113

113-
ehrpwm0_tbclk: clock-ehrpwm0-tbclk {
114+
ehrpwm0_tbclk: clock-ehrpwm0-tbclk@0 {
115+
reg = <0>;
114116
#clock-cells = <0>;
115117
compatible = "ti,gate-clock";
116118
clock-output-names = "ehrpwm0_tbclk";
117119
clocks = <&l4ls_gclk>;
118-
ti,bit-shift = <0>;
119120
};
120121

121-
ehrpwm1_tbclk: clock-ehrpwm1-tbclk {
122+
ehrpwm1_tbclk: clock-ehrpwm1-tbclk@1 {
123+
reg = <1>;
122124
#clock-cells = <0>;
123125
compatible = "ti,gate-clock";
124126
clock-output-names = "ehrpwm1_tbclk";
125127
clocks = <&l4ls_gclk>;
126-
ti,bit-shift = <1>;
127128
};
128129

129-
ehrpwm2_tbclk: clock-ehrpwm2-tbclk {
130+
ehrpwm2_tbclk: clock-ehrpwm2-tbclk@2 {
131+
reg = <2>;
130132
#clock-cells = <0>;
131133
compatible = "ti,gate-clock";
132134
clock-output-names = "ehrpwm2_tbclk";
133135
clocks = <&l4ls_gclk>;
134-
ti,bit-shift = <2>;
135136
};
136137
};
137138
};
@@ -566,17 +567,19 @@
566567
compatible = "ti,clksel";
567568
reg = <0x52c>;
568569
#clock-cells = <2>;
569-
#address-cells = <0>;
570+
#address-cells = <1>;
571+
#size-cells = <0>;
570572

571-
gfx_fclk_clksel_ck: clock-gfx-fclk-clksel {
573+
gfx_fclk_clksel_ck: clock-gfx-fclk-clksel@1 {
574+
reg = <1>;
572575
#clock-cells = <0>;
573576
compatible = "ti,mux-clock";
574577
clock-output-names = "gfx_fclk_clksel_ck";
575578
clocks = <&dpll_core_m4_ck>, <&dpll_per_m2_ck>;
576-
ti,bit-shift = <1>;
577579
};
578580

579-
gfx_fck_div_ck: clock-gfx-fck-div {
581+
gfx_fck_div_ck: clock-gfx-fck-div@0 {
582+
reg = <0>;
580583
#clock-cells = <0>;
581584
compatible = "ti,divider-clock";
582585
clock-output-names = "gfx_fck_div_ck";
@@ -589,30 +592,32 @@
589592
compatible = "ti,clksel";
590593
reg = <0x700>;
591594
#clock-cells = <2>;
592-
#address-cells = <0>;
595+
#address-cells = <1>;
596+
#size-cells = <0>;
593597

594-
sysclkout_pre_ck: clock-sysclkout-pre {
598+
sysclkout_pre_ck: clock-sysclkout-pre@0 {
599+
reg = <0>;
595600
#clock-cells = <0>;
596601
compatible = "ti,mux-clock";
597602
clock-output-names = "sysclkout_pre_ck";
598603
clocks = <&clk_32768_ck>, <&l3_gclk>, <&dpll_ddr_m2_ck>, <&dpll_per_m2_ck>, <&lcd_gclk>;
599604
};
600605

601-
clkout2_div_ck: clock-clkout2-div {
606+
clkout2_div_ck: clock-clkout2-div@3 {
607+
reg = <3>;
602608
#clock-cells = <0>;
603609
compatible = "ti,divider-clock";
604610
clock-output-names = "clkout2_div_ck";
605611
clocks = <&sysclkout_pre_ck>;
606-
ti,bit-shift = <3>;
607612
ti,max-div = <8>;
608613
};
609614

610-
clkout2_ck: clock-clkout2 {
615+
clkout2_ck: clock-clkout2@7 {
616+
reg = <7>;
611617
#clock-cells = <0>;
612618
compatible = "ti,gate-clock";
613619
clock-output-names = "clkout2_ck";
614620
clocks = <&clkout2_div_ck>;
615-
ti,bit-shift = <7>;
616621
};
617622
};
618623
};

0 commit comments

Comments
 (0)