Skip to content

Commit 19c0a52

Browse files
committed
ARM: dts: use upstream axi-clkgen clock-names order
Change the order of clocks and clock-names in "adi,axi-clkgen-2.00.a" node to match the order specified in the binding documentation. This order was formalized upstream in [1]. [1]: https://lore.kernel.org/all/20241029-axi-clkgen-fix-axiclk-v2-1-bc5e0733ad76@analog.com/ Signed-off-by: David Lechner <dlechner@baylibre.com>
1 parent 7339f50 commit 19c0a52

39 files changed

+79
-79
lines changed

arch/arm/boot/dts/xilinx/zynq-adrv9361-z7035-fmc.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@
182182
compatible = "adi,axi-clkgen-2.00.a";
183183
reg = <0x79000000 0x10000>;
184184
#clock-cells = <0>;
185-
clocks = <&clkc 15>, <&clkc 16>;
186-
clock-names = "s_axi_aclk", "clkin1";
185+
clocks = <&clkc 16>, <&clkc 15>;
186+
clock-names = "clkin1", "s_axi_aclk";
187187
};
188188

189189
axi_hdmi@70e00000 {

arch/arm/boot/dts/xilinx/zynq-coraz7s-ad7687-pmdz.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
reg = <0x44a70000 0x10000>;
8282
#clock-cells = <0>;
8383
clocks = <&clkc 15>, <&clkc 15>;
84-
clock-names = "s_axi_aclk", "clkin1";
84+
clock-names = "clkin1", "s_axi_aclk";
8585
clock-output-names = "spi_clk";
8686
};
8787
};

arch/arm/boot/dts/xilinx/zynq-coraz7s-ad7689-ardz.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
reg = <0x44a70000 0x10000>;
105105
#clock-cells = <0>;
106106
clocks = <&clkc 15>, <&clkc 15>;
107-
clock-names = "s_axi_aclk", "clkin1";
107+
clock-names = "clkin1", "s_axi_aclk";
108108
clock-output-names = "spi_clk";
109109
};
110110
};

arch/arm/boot/dts/xilinx/zynq-coraz7s-ad7946.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
reg = <0x44a70000 0x10000>;
8181
#clock-cells = <0>;
8282
clocks = <&clkc 15>, <&clkc 15>;
83-
clock-names = "s_axi_aclk", "clkin1";
83+
clock-names = "clkin1", "s_axi_aclk";
8484
clock-output-names = "spi_clk";
8585
};
8686
};

arch/arm/boot/dts/xilinx/zynq-coraz7s-ad7984.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
reg = <0x44a70000 0x10000>;
8282
#clock-cells = <0>;
8383
clocks = <&clkc 15>, <&clkc 15>;
84-
clock-names = "s_axi_aclk", "clkin1";
84+
clock-names = "clkin1", "s_axi_aclk";
8585
clock-output-names = "spi_clk";
8686
};
8787
};

arch/arm/boot/dts/xilinx/zynq-coraz7s-adaq4003.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
reg = <0x44a70000 0x10000>;
8484
#clock-cells = <0>;
8585
clocks = <&clkc 15>, <&clkc 15>;
86-
clock-names = "s_axi_aclk", "clkin1";
86+
clock-names = "clkin1", "s_axi_aclk";
8787
clock-output-names = "spi_clk";
8888
};
8989
};

arch/arm/boot/dts/xilinx/zynq-coraz7s-cn0540.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
reg = <0x44a70000 0x10000>;
155155
#clock-cells = <0>;
156156
clocks = <&clkc 15>, <&clkc 15>;
157-
clock-names = "s_axi_aclk", "clkin1";
157+
clock-names = "clkin1", "s_axi_aclk";
158158
clock-output-names = "spi_clk";
159159
};
160160
};

arch/arm/boot/dts/xilinx/zynq-zc702-adv7511.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
compatible = "adi,axi-clkgen-2.00.a";
9494
reg = <0x79000000 0x10000>;
9595
#clock-cells = <0>;
96-
clocks = <&clkc 15>, <&clkc 16>;
97-
clock-names = "s_axi_aclk", "clkin1";
96+
clocks = <&clkc 16>, <&clkc 15>;
97+
clock-names = "clkin1", "s_axi_aclk";
9898
};
9999

100100
axi_hdmi@70e00000 {

arch/arm/boot/dts/xilinx/zynq-zc706-adv7511-adrv9008-1.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
compatible = "adi,axi-clkgen-2.00.a";
7373
reg = <0x43c10000 0x10000>;
7474
#clock-cells = <0>;
75-
clocks = <&clkc 15>, <&clk0_ad9528 1>;
76-
clock-names = "s_axi_aclk", "clkin1";
75+
clocks = <&clk0_ad9528 1>, <&clkc 15>;
76+
clock-names = "clkin1", "s_axi_aclk";
7777
clock-output-names = "axi_rx_clkgen";
7878
};
7979

arch/arm/boot/dts/xilinx/zynq-zc706-adv7511-adrv9008-2.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,17 @@
112112
compatible = "adi,axi-clkgen-2.00.a";
113113
reg = <0x43c00000 0x10000>;
114114
#clock-cells = <0>;
115-
clocks = <&clkc 15>, <&clk0_ad9528 1>;
116-
clock-names = "s_axi_aclk", "clkin1";
115+
clocks = <&clk0_ad9528 1>, <&clkc 15>;
116+
clock-names = "clkin1", "s_axi_aclk";
117117
clock-output-names = "axi_tx_clkgen";
118118
};
119119

120120
axi_rx_os_clkgen: axi-clkgen@43c20000 {
121121
compatible = "adi,axi-clkgen-2.00.a";
122122
reg = <0x43c20000 0x10000>;
123123
#clock-cells = <0>;
124-
clocks = <&clkc 15>, <&clk0_ad9528 1>;
125-
clock-names = "s_axi_aclk", "clkin1";
124+
clocks = <&clk0_ad9528 1>, <&clkc 15>;
125+
clock-names = "clkin1", "s_axi_aclk";
126126
clock-output-names = "axi_rx_os_clkgen";
127127
};
128128

0 commit comments

Comments
 (0)