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

Commit 7c06abcb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-fixes3-for-v3.13' of... 

Merge tag 'renesas-fixes3-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

From Simon Horman:
Third Round of Renesas ARM based SoC Fixes for v3.13

* sh7372 (SH-Mobile AP4) based Mackerel board
  r8a773a0 (SH-Mobile AG5) based kzm9g board
  r8a7740 (R-Mobile A1) based Armadillo board

  - Correct coherent DMA mask

    This resolves regressions introduced by 4dcfa600
    ("ARM: DMA-API: better handing of DMA masks for coherent allocations")
    in v3.12-rc1.

* tag 'renesas-fixes3-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: mackerel: Fix coherent DMA mask
  ARM: shmobile: kzm9g: Fix coherent DMA mask
  ARM: shmobile: armadillo: Fix coherent DMA mask

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9b17c165 b6328a6b

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

	},

};