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

Commit 426f1af9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renesas/soc 



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

This moves the addition of init_consistent_dma_size() from the board
files into the common sh7372_map_io() functions where all the other
contents of the board specific map_io calls have gone.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5cd9eb27 e9dd7ed2

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -2845,6 +2845,12 @@ S: Maintained 
F:	drivers/media/video/m5mols/

F:	include/media/m5mols.h



FUJITSU TABLET EXTRAS

M:	Robert Gerlach <khnz@gmx.de>

L:	platform-driver-x86@vger.kernel.org

S:	Maintained

F:	drivers/platform/x86/fujitsu-tablet.c



FUSE: FILESYSTEM IN USERSPACE

M:	Miklos Szeredi <miklos@szeredi.hu>

L:	fuse-devel@lists.sourceforge.net

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

+1 −0
Original line number Diff line number Diff line
@@ -1188,6 +1188,7 @@ static struct i2c_board_info i2c1_devices[] = { 
	},

};





#define GPIO_PORT9CR	0xE6051009

#define GPIO_PORT10CR	0xE605100A

#define USCCR1		0xE6058144

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

+1 −10
Original line number Diff line number Diff line
@@ -1335,15 +1335,6 @@ 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
@@ -1563,7 +1554,7 @@ static void __init mackerel_init(void) 
}



MACHINE_START(MACKEREL, "mackerel")

	.map_io		= mackerel_map_io,

	.map_io		= sh7372_map_io,

	.init_early	= sh7372_add_early_devices,

	.init_irq	= sh7372_init_irq,

	.handle_irq	= shmobile_handle_irq_intc,

arch/arm/mach-shmobile/setup-sh7372.c

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/sh_intc.h>

#include <linux/sh_timer.h>

#include <linux/pm_domain.h>

#include <linux/dma-mapping.h>

#include <mach/hardware.h>

#include <mach/sh7372.h>

#include <mach/common.h>
@@ -54,6 +55,12 @@ static struct map_desc sh7372_io_desc[] __initdata = { 
void __init sh7372_map_io(void)

{

	iotable_init(sh7372_io_desc, ARRAY_SIZE(sh7372_io_desc));



	/*

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

	 * enough to allocate the frame buffer memory.

	 */

	init_consistent_dma_size(12 << 20);

}



/* SCIFA0 */

arch/sh/kernel/cpu/sh2a/ex.S

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ vector = 0 
	.long	exception_entry0 + vector * 6

vector	=	vector + 1

	.endr

vector	=	0

	.rept	256

	.long	exception_entry1 + vector * 6

vector	=	vector + 1