Skip to content

Commit b6d9884

Browse files
committed
fixup! dts: bcm2712-rpi: Give PIO the "heavy" DMA channels
Use the simplified channel property declaration scheme, where the DMA driver finds the best match based on positive matches with no hard exclusions. N.B. The new scheme should give the same results with old and new DTB, with the old property name still be accepted for backwards-compatibility. Signed-off-by: Phil Elwell <[email protected]>
1 parent 2efed8d commit b6d9884

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
#include <dt-bindings/power/raspberrypi-power.h>
44

5-
#define DMA_SEL_WANTHEAVY (1 << 8)
6-
#define DMA_SEL_ONLYHEAVY (1 << 9)
5+
#define DMA_FLAG_HEAVY (1 << 8)
76

87
&soc {
98
firmware: firmware {
@@ -95,20 +94,18 @@
9594
};
9695

9796
&rp1_dma {
98-
snps,sel-require = <DMA_SEL_WANTHEAVY DMA_SEL_WANTHEAVY 0 0 0 0 0 0>;
99-
snps,sel-preclude = <0 0 DMA_SEL_ONLYHEAVY DMA_SEL_ONLYHEAVY DMA_SEL_ONLYHEAVY
100-
DMA_SEL_ONLYHEAVY DMA_SEL_ONLYHEAVY DMA_SEL_ONLYHEAVY>;
97+
snps,chan-flags = <DMA_FLAG_HEAVY DMA_FLAG_HEAVY 0 0 0 0 0 0>;
10198
};
10299

103100
pio: &rp1_pio {
104-
dmas = <&rp1_dma (RP1_DMA_PIO_CH0_TX | DMA_SEL_WANTHEAVY)>,
105-
<&rp1_dma (RP1_DMA_PIO_CH0_RX | DMA_SEL_WANTHEAVY)>,
106-
<&rp1_dma (RP1_DMA_PIO_CH1_TX | DMA_SEL_WANTHEAVY)>,
107-
<&rp1_dma (RP1_DMA_PIO_CH1_RX | DMA_SEL_WANTHEAVY)>,
108-
<&rp1_dma (RP1_DMA_PIO_CH2_TX | DMA_SEL_WANTHEAVY)>,
109-
<&rp1_dma (RP1_DMA_PIO_CH2_RX | DMA_SEL_WANTHEAVY)>,
110-
<&rp1_dma (RP1_DMA_PIO_CH3_TX | DMA_SEL_WANTHEAVY)>,
111-
<&rp1_dma (RP1_DMA_PIO_CH3_RX | DMA_SEL_WANTHEAVY)>;
101+
dmas = <&rp1_dma (RP1_DMA_PIO_CH0_TX | DMA_FLAG_HEAVY)>,
102+
<&rp1_dma (RP1_DMA_PIO_CH0_RX | DMA_FLAG_HEAVY)>,
103+
<&rp1_dma (RP1_DMA_PIO_CH1_TX | DMA_FLAG_HEAVY)>,
104+
<&rp1_dma (RP1_DMA_PIO_CH1_RX | DMA_FLAG_HEAVY)>,
105+
<&rp1_dma (RP1_DMA_PIO_CH2_TX | DMA_FLAG_HEAVY)>,
106+
<&rp1_dma (RP1_DMA_PIO_CH2_RX | DMA_FLAG_HEAVY)>,
107+
<&rp1_dma (RP1_DMA_PIO_CH3_TX | DMA_FLAG_HEAVY)>,
108+
<&rp1_dma (RP1_DMA_PIO_CH3_RX | DMA_FLAG_HEAVY)>;
112109
status = "okay";
113110
};
114111

0 commit comments

Comments
 (0)