Commit a896a00e authored by popcornmix's avatar popcornmix
Browse files

bcm2835-dma: Squash: Move DMA_WIDE flags to 24,25 to avoid conflict


Signed-off-by: default avatarpopcornmix <popcornmix@gmail.com>
parent bcf09c55
......@@ -179,7 +179,7 @@
};
&hdmi0 {
dmas = <&dma (10|(1<<27)|(1<<28)|(0<<16)|(15<<20))>;
dmas = <&dma (10|(1<<27)|(1<<24)|(0<<16)|(15<<20))>;
status = "disabled";
};
......@@ -188,7 +188,7 @@
};
&hdmi1 {
dmas = <&dma (17|(1<<27)|(1<<28)|(0<<16)|(15<<20))>;
dmas = <&dma (17|(1<<27)|(1<<24)|(0<<16)|(15<<20))>;
status = "disabled";
};
......
......@@ -172,12 +172,12 @@ struct bcm2835_desc {
0 : BCM2835_DMA_WAIT_RESP)
/* A fake bit to request that the driver requires wide reads */
#define BCM2835_DMA_WIDE_SOURCE BIT(28)
#define BCM2835_DMA_WIDE_SOURCE BIT(24)
#define WIDE_SOURCE(x) ((x & BCM2835_DMA_WIDE_SOURCE) ? \
BCM2835_DMA_S_WIDTH : 0)
/* A fake bit to request that the driver requires wide writes */
#define BCM2835_DMA_WIDE_DEST BIT(29)
#define BCM2835_DMA_WIDE_DEST BIT(25)
#define WIDE_DEST(x) ((x & BCM2835_DMA_WIDE_DEST) ? \
BCM2835_DMA_D_WIDTH : 0)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment