Skip to content

Commit a896a00

Browse files
committed
bcm2835-dma: Squash: Move DMA_WIDE flags to 24,25 to avoid conflict
Signed-off-by: popcornmix <[email protected]>
1 parent bcf09c5 commit a896a00

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/arm/boot/dts/bcm2711-rpi.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
};
180180

181181
&hdmi0 {
182-
dmas = <&dma (10|(1<<27)|(1<<28)|(0<<16)|(15<<20))>;
182+
dmas = <&dma (10|(1<<27)|(1<<24)|(0<<16)|(15<<20))>;
183183
status = "disabled";
184184
};
185185

@@ -188,7 +188,7 @@
188188
};
189189

190190
&hdmi1 {
191-
dmas = <&dma (17|(1<<27)|(1<<28)|(0<<16)|(15<<20))>;
191+
dmas = <&dma (17|(1<<27)|(1<<24)|(0<<16)|(15<<20))>;
192192
status = "disabled";
193193
};
194194

drivers/dma/bcm2835-dma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ struct bcm2835_desc {
172172
0 : BCM2835_DMA_WAIT_RESP)
173173

174174
/* A fake bit to request that the driver requires wide reads */
175-
#define BCM2835_DMA_WIDE_SOURCE BIT(28)
175+
#define BCM2835_DMA_WIDE_SOURCE BIT(24)
176176
#define WIDE_SOURCE(x) ((x & BCM2835_DMA_WIDE_SOURCE) ? \
177177
BCM2835_DMA_S_WIDTH : 0)
178178

179179
/* A fake bit to request that the driver requires wide writes */
180-
#define BCM2835_DMA_WIDE_DEST BIT(29)
180+
#define BCM2835_DMA_WIDE_DEST BIT(25)
181181
#define WIDE_DEST(x) ((x & BCM2835_DMA_WIDE_DEST) ? \
182182
BCM2835_DMA_D_WIDTH : 0)
183183

0 commit comments

Comments
 (0)