Skip to content

Commit f43c9f5

Browse files
committed
arm: dts: fix adi,axi-pwmgen clocks
After backporting the dt-bindings fix from upstream, update the existing .dts files that use adi,axi-pwmgen-2.00.a to use the corrected clocks binding. In the HDL, ASYNC_CLK_EN=1 by default, so most projects have a separate external clock. The only exceptions are ad7606x, ad7616 and dc2677a, which have ASYNC_CLK_EN=0 and therefore only one clock. In arch/arm/boot/dts/xilinx/zynq-zed-adv7511-ad4134.dts the wrong clock was specified for the old binding so it will have a behavior change to use the correct clock for the PWM clock rate now. In arch/arm/boot/dts/xilinx/zynq-zed-adv7511-ltc2387.dts, we also drop the 0 in the phandle since #clock-cells = <0>; for &ref_clk. Signed-off-by: David Lechner <dlechner@baylibre.com>
1 parent 55a669e commit f43c9f5

28 files changed

+55
-31
lines changed

arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_de10_nano_ad5791.dts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
compatible = "adi,axi-pwmgen-2.00.a";
4646
reg = <0x00050000 0x1000>;
4747
#pwm-cells = <3>;
48-
clocks = <&spi_clk 0>;
48+
clocks = <&sys_clk>, <&spi_clk 0>;
49+
clock-names = "axi", "ext";
4950
};
5051

5152
tx_dma: dma-controller@30000 {

arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_sockit_dc2677a.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
reg = <0x00040000 0x1000>;
141141
#pwm-cells = <2>;
142142
clocks = <&sys_clk>;
143+
clock-names = "axi";
143144
};
144145

145146
gpio: gpio@9000 {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
reg = <0x44b00000 0x1000>;
3333
label = "adc_conversion_trigger";
3434
#pwm-cells = <2>;
35-
clocks = <&spi_clk>;
35+
clocks = <&clkc 15>, <&spi_clk>;
36+
clock-names = "axi", "ext";
3637
};
3738

3839
spi_engine: spi@44a00000 {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
reg = <0x44b00000 0x1000>;
3333
label = "adc_conversion_trigger";
3434
#pwm-cells = <2>;
35-
clocks = <&spi_clk>;
35+
clocks = <&clkc 15>, <&spi_clk>;
36+
clock-names = "axi", "ext";
3637
};
3738

3839
spi_engine: spi@44a00000 {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
reg = <0x44b00000 0x1000>;
3333
label = "adc_conversion_trigger";
3434
#pwm-cells = <2>;
35-
clocks = <&spi_clk>;
35+
clocks = <&clkc 15>, <&spi_clk>;
36+
clock-names = "axi", "ext";
3637
};
3738

3839
spi_engine: spi@44a00000 {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
reg = <0x44b00000 0x1000>;
5454
label = "adc_conversion_trigger";
5555
#pwm-cells = <2>;
56-
clocks = <&spi_clk>;
56+
clocks = <&clkc 15>, <&spi_clk>;
57+
clock-names = "axi", "ext";
5758
};
5859

5960
spi_engine: spi@44a00000 {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
reg = <0x44b00000 0x1000>;
5454
label = "adc_conversion_trigger";
5555
#pwm-cells = <2>;
56-
clocks = <&spi_clk>;
56+
clocks = <&clkc 15>, <&spi_clk>;
57+
clock-names = "axi", "ext";
5758
};
5859

5960
spi_engine: spi@44a00000 {

arch/arm/boot/dts/xilinx/zynq-coraz7s-pulsar.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
reg = <0x44b00000 0x1000>;
5353
label = "adc_conversion_trigger";
5454
#pwm-cells = <2>;
55-
clocks = <&spi_clk>;
55+
clocks = <&clkc 15>, <&spi_clk>;
56+
clock-names = "axi", "ext";
5657
};
5758

5859
spi_engine: spi@44a00000 {

arch/arm/boot/dts/xilinx/zynq-zed-adv7511-ad4000.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
reg = <0x44b00000 0x1000>;
5757
label = "adc_conversion_trigger";
5858
#pwm-cells = <2>;
59-
clocks = <&spi_clk>;
59+
clocks = <&clkc 15>, <&spi_clk>;
60+
clock-names = "axi", "ext";
6061
};
6162

6263
spi_engine: spi@0x44a00000 {

arch/arm/boot/dts/xilinx/zynq-zed-adv7511-ad4030-24.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
reg = <0x44b00000 0x1000>;
7373
label = "ad463x_cnv";
7474
#pwm-cells = <2>;
75-
clocks = <&cnv_ext_clk>;
76-
75+
clocks = <&clkc 15>, <&cnv_ext_clk>;
76+
clock-names = "axi", "ext";
7777
};
7878

7979
axi_spi_engine: spi@44a00000 {

0 commit comments

Comments
 (0)