TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Browse Source 
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
This commit is contained in:
Linus Torvalds
2014-01-10 15:54:49 +07:00
parent 7d1c153ab3 7c06abcb16
commit 2aa63ce000
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/mach-shmobile/board-armadillo800eva.c
+2 -2
View File
@@ -483,7 +483,7 @@ static struct platform_device lcdc0_device = {
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &lcdc0_info, .platform_data = &lcdc0_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
@@ -580,7 +580,7 @@ static struct platform_device hdmi_lcdc_device = {
.id = 1, .id = 1,
.dev = { .dev = {
.platform_data = &hdmi_lcdc_info, .platform_data = &hdmi_lcdc_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
arch/arm/mach-shmobile/board-kzm9g.c
+1 -1
View File
@@ -334,7 +334,7 @@ static struct platform_device lcdc_device = {
.resource = lcdc_resources, .resource = lcdc_resources,
.dev = { .dev = {
.platform_data = &lcdc_info, .platform_data = &lcdc_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
arch/arm/mach-shmobile/board-mackerel.c
+2 -2
View File
@@ -409,7 +409,7 @@ static struct platform_device lcdc_device = {
.resource = lcdc_resources, .resource = lcdc_resources,
.dev = { .dev = {
.platform_data = &lcdc_info, .platform_data = &lcdc_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };
@@ -499,7 +499,7 @@ static struct platform_device hdmi_lcdc_device = {
.id = 1, .id = 1,
.dev = { .dev = {
.platform_data = &hdmi_lcdc_info, .platform_data = &hdmi_lcdc_info,
.coherent_dma_mask = ~0, .coherent_dma_mask = DMA_BIT_MASK(32),
}, },
}; };