Skip to content

Commit aed2711

Browse files
dlechnunojsa
authored andcommitted
arch: arm: dts: ad7944: update for mainline SPI offload
Update ad7944 and similar .dts files for the SPI offload bindings that were accepted upstream. Signed-off-by: David Lechner <dlechner@baylibre.com>
1 parent 86e4cc2 commit aed2711

File tree

3 files changed

+48
-27
lines changed

3 files changed

+48
-27
lines changed

arch/arm/boot/dts/xilinx/zynq-zed-adv7511-ad7944.dts

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
regulator-name = "EVAL +2.5V supply (U12)";
4444
regulator-always-on;
4545
};
46+
47+
trigger_pwm: adc-pwm-trigger {
48+
compatible = "pwm-trigger";
49+
#trigger-source-cells = <0>;
50+
pwms = <&adc_trigger 0 10000 0>;
51+
};
4652
};
4753

4854
&fpga_axi {
@@ -69,19 +75,26 @@
6975
clock-names = "clkin1", "s_axi_aclk";
7076
clock-output-names = "spi_clk";
7177

72-
/* needs to be high enough to allow >= 91.5MHz SCLK for turbo */
78+
/*
79+
* Set to 2x max SCLK. Also need to consider SPI Engine extra
80+
* cycles for instructions.
81+
*/
7382
assigned-clocks = <&spi_clk>;
74-
assigned-clock-rates = <185000000>;
83+
assigned-clock-rates = <200000000>;
7584
};
7685

7786
axi_spi_engine_0: spi@44a00000 {
78-
compatible = "adi-ex,axi-spi-engine-1.00.a";
87+
compatible = "adi,axi-spi-engine-1.00.a";
7988
reg = <0x44a00000 0x1000>;
8089
interrupt-parent = <&intc>;
8190
interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>;
8291
clocks = <&clkc 15>, <&spi_clk>;
8392
clock-names = "s_axi_aclk", "spi_clk";
8493

94+
dmas = <&rx_dma 0>;
95+
dma-names = "offload0-rx";
96+
trigger-sources = <&trigger_pwm>;
97+
8598
#address-cells = <1>;
8699
#size-cells = <0>;
87100

@@ -96,12 +109,6 @@
96109
bvdd-supply = <&eval_u10>;
97110
ref-supply = <&eval_u5>;
98111
turbo-gpios = <&gpio0 87 GPIO_ACTIVE_HIGH>;
99-
100-
/* out of tree extensions */
101-
dmas = <&rx_dma 0>;
102-
dma-names = "rx";
103-
pwms = <&adc_trigger 0 0>;
104-
pwm-names = "cnv";
105112
};
106113
};
107114
};

arch/arm/boot/dts/xilinx/zynq-zed-adv7511-ad7985.dts

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
regulator-name = "EVAL +2.5V supply (U12)";
4444
regulator-always-on;
4545
};
46+
47+
trigger_pwm: adc-pwm-trigger {
48+
compatible = "pwm-trigger";
49+
#trigger-source-cells = <0>;
50+
pwms = <&adc_trigger 0 10000 0>;
51+
};
4652
};
4753

4854
&fpga_axi {
@@ -69,19 +75,26 @@
6975
clock-names = "clkin1", "s_axi_aclk";
7076
clock-output-names = "spi_clk";
7177

72-
/* needs to be high enough to allow >= 91.5MHz SCLK for turbo */
78+
/*
79+
* Set to 2x max SCLK. Also need to consider SPI Engine extra
80+
* cycles for instructions.
81+
*/
7382
assigned-clocks = <&spi_clk>;
74-
assigned-clock-rates = <185000000>;
83+
assigned-clock-rates = <200000000>;
7584
};
7685

7786
axi_spi_engine_0: spi@44a00000 {
78-
compatible = "adi-ex,axi-spi-engine-1.00.a";
87+
compatible = "adi,axi-spi-engine-1.00.a";
7988
reg = <0x44a00000 0x1000>;
8089
interrupt-parent = <&intc>;
8190
interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>;
8291
clocks = <&clkc 15>, <&spi_clk>;
8392
clock-names = "s_axi_aclk", "spi_clk";
8493

94+
dmas = <&rx_dma 0>;
95+
dma-names = "offload0-rx";
96+
trigger-sources = <&trigger_pwm>;
97+
8598
#address-cells = <1>;
8699
#size-cells = <0>;
87100

@@ -96,12 +109,6 @@
96109
bvdd-supply = <&eval_u10>;
97110
ref-supply = <&eval_u5>;
98111
turbo-gpios = <&gpio0 87 GPIO_ACTIVE_HIGH>;
99-
100-
/* out of tree extensions */
101-
dmas = <&rx_dma 0>;
102-
dma-names = "rx";
103-
pwms = <&adc_trigger 0 0>;
104-
pwm-names = "cnv";
105112
};
106113
};
107114
};

arch/arm/boot/dts/xilinx/zynq-zed-adv7511-ad7986.dts

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
regulator-name = "EVAL +2.5V supply (U12)";
4444
regulator-always-on;
4545
};
46+
47+
trigger_pwm: adc-pwm-trigger {
48+
compatible = "pwm-trigger";
49+
#trigger-source-cells = <0>;
50+
pwms = <&adc_trigger 0 10000 0>;
51+
};
4652
};
4753

4854
&fpga_axi {
@@ -69,19 +75,26 @@
6975
clock-names = "clkin1", "s_axi_aclk";
7076
clock-output-names = "spi_clk";
7177

72-
/* needs to be high enough to allow >= 91.5MHz SCLK for turbo */
78+
/*
79+
* Set to 2x max SCLK. Also need to consider SPI Engine extra
80+
* cycles for instructions.
81+
*/
7382
assigned-clocks = <&spi_clk>;
74-
assigned-clock-rates = <185000000>;
83+
assigned-clock-rates = <200000000>;
7584
};
7685

7786
axi_spi_engine_0: spi@44a00000 {
78-
compatible = "adi-ex,axi-spi-engine-1.00.a";
87+
compatible = "adi,axi-spi-engine-1.00.a";
7988
reg = <0x44a00000 0x1000>;
8089
interrupt-parent = <&intc>;
8190
interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>;
8291
clocks = <&clkc 15>, <&spi_clk>;
8392
clock-names = "s_axi_aclk", "spi_clk";
8493

94+
dmas = <&rx_dma 0>;
95+
dma-names = "offload0-rx";
96+
trigger-sources = <&trigger_pwm>;
97+
8598
#address-cells = <1>;
8699
#size-cells = <0>;
87100

@@ -96,12 +109,6 @@
96109
bvdd-supply = <&eval_u10>;
97110
ref-supply = <&eval_u5>;
98111
turbo-gpios = <&gpio0 87 GPIO_ACTIVE_HIGH>;
99-
100-
/* out of tree extensions */
101-
dmas = <&rx_dma 0>;
102-
dma-names = "rx";
103-
pwms = <&adc_trigger 0 0>;
104-
pwm-names = "cnv";
105112
};
106113
};
107114
};

0 commit comments

Comments
 (0)