Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: sunxi: Unify the DE2 bus clocks order

The DE2 bus takes two clocks, named bus and mod according to the binding.

However, the order of these clocks change from one SoC to another. Even
though it might not be an issue in most cases, having consistency will help
if we ever need to have some code to deal with deprecated bindings, and in
general it's just better.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

+20 -20
+4 -4
arch/arm/boot/dts/sun8i-a83t.dtsi
··· 314 314 display_clocks: clock@1000000 { 315 315 compatible = "allwinner,sun8i-a83t-de2-clk"; 316 316 reg = <0x01000000 0x100000>; 317 - clocks = <&ccu CLK_PLL_DE>, 318 - <&ccu CLK_BUS_DE>; 319 - clock-names = "mod", 320 - "bus"; 317 + clocks = <&ccu CLK_BUS_DE>, 318 + <&ccu CLK_PLL_DE>; 319 + clock-names = "bus", 320 + "mod"; 321 321 resets = <&ccu RST_BUS_DE>; 322 322 #clock-cells = <1>; 323 323 #reset-cells = <1>;
+4 -4
arch/arm/boot/dts/sun8i-r40.dtsi
··· 119 119 compatible = "allwinner,sun8i-r40-de2-clk", 120 120 "allwinner,sun8i-h3-de2-clk"; 121 121 reg = <0x01000000 0x100000>; 122 - clocks = <&ccu CLK_DE>, 123 - <&ccu CLK_BUS_DE>; 124 - clock-names = "mod", 125 - "bus"; 122 + clocks = <&ccu CLK_BUS_DE>, 123 + <&ccu CLK_DE>; 124 + clock-names = "bus", 125 + "mod"; 126 126 resets = <&ccu RST_BUS_DE>; 127 127 #clock-cells = <1>; 128 128 #reset-cells = <1>;
+4 -4
arch/arm/boot/dts/sun8i-v3s.dtsi
··· 106 106 display_clocks: clock@1000000 { 107 107 compatible = "allwinner,sun8i-v3s-de2-clk"; 108 108 reg = <0x01000000 0x100000>; 109 - clocks = <&ccu CLK_DE>, 110 - <&ccu CLK_BUS_DE>; 111 - clock-names = "mod", 112 - "bus"; 109 + clocks = <&ccu CLK_BUS_DE>, 110 + <&ccu CLK_DE>; 111 + clock-names = "bus", 112 + "mod"; 113 113 resets = <&ccu RST_BUS_DE>; 114 114 #clock-cells = <1>; 115 115 #reset-cells = <1>;
+4 -4
arch/arm/boot/dts/sunxi-h3-h5.dtsi
··· 114 114 display_clocks: clock@1000000 { 115 115 /* compatible is in per SoC .dtsi file */ 116 116 reg = <0x01000000 0x100000>; 117 - clocks = <&ccu CLK_DE>, 118 - <&ccu CLK_BUS_DE>; 119 - clock-names = "mod", 120 - "bus"; 117 + clocks = <&ccu CLK_BUS_DE>, 118 + <&ccu CLK_DE>; 119 + clock-names = "bus", 120 + "mod"; 121 121 resets = <&ccu RST_BUS_DE>; 122 122 #clock-cells = <1>; 123 123 #reset-cells = <1>;
+4 -4
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
··· 228 228 display_clocks: clock@0 { 229 229 compatible = "allwinner,sun50i-a64-de2-clk"; 230 230 reg = <0x0 0x100000>; 231 - clocks = <&ccu CLK_DE>, 232 - <&ccu CLK_BUS_DE>; 233 - clock-names = "mod", 234 - "bus"; 231 + clocks = <&ccu CLK_BUS_DE>, 232 + <&ccu CLK_DE>; 233 + clock-names = "bus", 234 + "mod"; 235 235 resets = <&ccu RST_BUS_DE>; 236 236 #clock-cells = <1>; 237 237 #reset-cells = <1>;