Skip to content

Commit 765866e

Browse files
wensmripard
authored andcommitted
ARM: dts: sunxi: Use macros for references to CCU clocks
A few clocks from the CCU were exported later, and references to them in the device tree were using raw numbers. Now that the DT binding header changes are in as well, switch to the macros for more clarity. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
1 parent 60d0426 commit 765866e

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

arch/arm/boot/dts/sun5i.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
mbus: dram-controller@1c01000 {
186186
compatible = "allwinner,sun5i-a13-mbus";
187187
reg = <0x01c01000 0x1000>;
188-
clocks = <&ccu 99>;
188+
clocks = <&ccu CLK_MBUS>;
189189
dma-ranges = <0x00000000 0x40000000 0x20000000>;
190190
#interconnect-cells = <1>;
191191
};

arch/arm/boot/dts/sun8i-a83t.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,9 +1006,9 @@
10061006
reg = <0x01c30000 0x104>;
10071007
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
10081008
interrupt-names = "macirq";
1009-
resets = <&ccu 13>;
1009+
resets = <&ccu CLK_BUS_EMAC>;
10101010
reset-names = "stmmaceth";
1011-
clocks = <&ccu 27>;
1011+
clocks = <&ccu RST_BUS_EMAC>;
10121012
clock-names = "stmmaceth";
10131013
status = "disabled";
10141014

@@ -1102,7 +1102,7 @@
11021102
compatible = "allwinner,sun8i-a83t-r-ccu";
11031103
reg = <0x01f01400 0x400>;
11041104
clocks = <&osc24M>, <&osc16Md512>, <&osc16M>,
1105-
<&ccu 6>;
1105+
<&ccu CLK_PLL_PERIPH>;
11061106
clock-names = "hosc", "losc", "iosc", "pll-periph";
11071107
#clock-cells = <1>;
11081108
#reset-cells = <1>;

arch/arm/boot/dts/sun8i-r40.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@
995995
compatible = "allwinner,sun8i-r40-hdmi-phy";
996996
reg = <0x01ef0000 0x10000>;
997997
clocks = <&ccu CLK_BUS_HDMI1>, <&ccu CLK_HDMI_SLOW>,
998-
<&ccu 7>, <&ccu 16>;
998+
<&ccu CLK_PLL_VIDEO0>, <&ccu CLK_PLL_VIDEO1>;
999999
clock-names = "bus", "mod", "pll-0", "pll-1";
10001000
resets = <&ccu RST_BUS_HDMI0>;
10011001
reset-names = "phy";

arch/arm/boot/dts/sunxi-h3-h5.dtsi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@
559559
mbus: dram-controller@1c62000 {
560560
compatible = "allwinner,sun8i-h3-mbus";
561561
reg = <0x01c62000 0x1000>;
562-
clocks = <&ccu 113>;
562+
clocks = <&ccu CLK_MBUS>;
563563
dma-ranges = <0x00000000 0x40000000 0xc0000000>;
564564
#interconnect-cells = <1>;
565565
};
@@ -817,7 +817,7 @@
817817
compatible = "allwinner,sun8i-h3-hdmi-phy";
818818
reg = <0x01ef0000 0x10000>;
819819
clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>,
820-
<&ccu 6>;
820+
<&ccu CLK_PLL_VIDEO>;
821821
clock-names = "bus", "mod", "pll-0";
822822
resets = <&ccu RST_BUS_HDMI0>;
823823
reset-names = "phy";
@@ -837,7 +837,8 @@
837837
r_ccu: clock@1f01400 {
838838
compatible = "allwinner,sun8i-h3-r-ccu";
839839
reg = <0x01f01400 0x100>;
840-
clocks = <&osc24M>, <&rtc 0>, <&rtc 2>, <&ccu 9>;
840+
clocks = <&osc24M>, <&rtc 0>, <&rtc 2>,
841+
<&ccu CLK_PLL_PERIPH0>;
841842
clock-names = "hosc", "losc", "iosc", "pll-periph";
842843
#clock-cells = <1>;
843844
#reset-cells = <1>;

0 commit comments

Comments
 (0)