Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aa63ce0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7d1c153a 7c06abcb

arch/arm/mach-shmobile/board-armadillo800eva.c

+2 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static struct platform_device lcdc0_device = { 
	.id		= 0,

	.dev	= {

		.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,

	.dev	= {

		.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
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static struct platform_device lcdc_device = { 
	.resource	= lcdc_resources,

	.dev	= {

		.platform_data	= &lcdc_info,

		.coherent_dma_mask = ~0,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};

arch/arm/mach-shmobile/board-mackerel.c

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static struct platform_device lcdc_device = { 
	.resource	= lcdc_resources,

	.dev	= {

		.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,

	.dev	= {

		.platform_data	= &hdmi_lcdc_info,

		.coherent_dma_mask = ~0,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};