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

Commit 5cd9eb27 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'renesas/fixes' into renesas/soc 



The fixes branch was merged into mainline just after v3.3-rc7,
I'm merging it into this branch to fix up a nontrivial merge
conflict. Unfortunately this means that we are now based on
a commit between -rc releases, which we normally try to avoid.

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

Resolution suggested by Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a6e24019 e49d603c

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

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mfd/tmio.h>

#include <linux/sh_clk.h>

#include <linux/videodev2.h>

#include <video/sh_mobile_lcdc.h>

#include <video/sh_mipi_dsi.h>

#include <sound/sh_fsi.h>

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

+1 −1
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ static struct fsi_ak4642_info fsi2_ak4643_info = { 
static struct platform_device fsi_ak4643_device = {

	.name	= "fsi-ak4642-audio",

	.dev	= {

		.platform_data	= &fsi_info,

		.platform_data	= &fsi2_ak4643_info,

	},

};

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

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/smsc911x.h>

#include <linux/videodev2.h>

#include <mach/common.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -241,7 +242,7 @@ static struct sh_mobile_lcdc_info lcdc0_info = { 
	.clock_source	= LCDC_CLK_BUS,

	.ch[0] = {

		.chan			= LCDC_CHAN_MAINLCD,

		.bpp			= 16,

		.fourcc = V4L2_PIX_FMT_RGB565,

		.interface_type		= RGB24,

		.clock_divider		= 5,

		.flags			= 0,

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

+10 −1
Original line number Diff line number Diff line
@@ -1335,6 +1335,15 @@ static struct i2c_board_info i2c1_devices[] = { 
	},

};



static void __init mackerel_map_io(void)

{

	sh7372_map_io();

	/* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't

	 * enough to allocate the frame buffer memory.

	 */

	init_consistent_dma_size(12 << 20);

}



#define GPIO_PORT9CR	0xE6051009

#define GPIO_PORT10CR	0xE605100A

#define GPIO_PORT167CR	0xE60520A7
@@ -1554,7 +1563,7 @@ static void __init mackerel_init(void) 
}



MACHINE_START(MACKEREL, "mackerel")

	.map_io		= sh7372_map_io,

	.map_io		= mackerel_map_io,

	.init_early	= sh7372_add_early_devices,

	.init_irq	= sh7372_init_irq,

	.handle_irq	= shmobile_handle_irq_intc,