Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"A few fixes for Renesas platforms to fixup DMA masks (this started
causing errors once the DMA API added checks for valid masks in 3.13)"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: shmobile: mackerel: Fix coherent DMA mask
ARM: shmobile: kzm9g: Fix coherent DMA mask
ARM: shmobile: armadillo: Fix coherent DMA mask
+5
-5
+2
-2
arch/arm/mach-shmobile/board-armadillo800eva.c
+2
-2
arch/arm/mach-shmobile/board-armadillo800eva.c
···
483
483
.id = 0,
484
484
.dev = {
485
485
.platform_data = &lcdc0_info,
486
-
.coherent_dma_mask = ~0,
486
+
.coherent_dma_mask = DMA_BIT_MASK(32),
487
487
},
488
488
};
489
489
···
580
580
.id = 1,
581
581
.dev = {
582
582
.platform_data = &hdmi_lcdc_info,
583
-
.coherent_dma_mask = ~0,
583
+
.coherent_dma_mask = DMA_BIT_MASK(32),
584
584
},
585
585
};
586
586
+1
-1
arch/arm/mach-shmobile/board-kzm9g.c
+1
-1
arch/arm/mach-shmobile/board-kzm9g.c
+2
-2
arch/arm/mach-shmobile/board-mackerel.c
+2
-2
arch/arm/mach-shmobile/board-mackerel.c
···
409
409
.resource = lcdc_resources,
410
410
.dev = {
411
411
.platform_data = &lcdc_info,
412
-
.coherent_dma_mask = ~0,
412
+
.coherent_dma_mask = DMA_BIT_MASK(32),
413
413
},
414
414
};
415
415
···
499
499
.id = 1,
500
500
.dev = {
501
501
.platform_data = &hdmi_lcdc_info,
502
-
.coherent_dma_mask = ~0,
502
+
.coherent_dma_mask = DMA_BIT_MASK(32),
503
503
},
504
504
};
505
505