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

Commit b3c7740a authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-fixes-for-tony' of... 

Merge branch 'omap-fixes-for-tony' of git://dev.omapzoom.org/pub/scm/saaguirre/linux-omap-camera into omap-fixes-for-linus
parents 220bf991 e6e8ea63

arch/arm/configs/omap_zoom2_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ CONFIG_DEVKMEM=y 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=32

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=1

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

arch/arm/configs/omap_zoom3_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ CONFIG_DEVKMEM=y 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=32

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=1

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

arch/arm/mach-omap2/board-3630sdp.c

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ static struct omap_board_mux board_mux[] __initdata = { 
static void __init omap_sdp_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

	omap_serial_init();

	zoom_peripherals_init();

	board_smc91x_init();

	enable_board_wakeup_source();

arch/arm/mach-omap2/board-zoom-debugboard.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 


static struct platform_device zoom_debugboard_serial_device = {

	.name			= "serial8250",

	.id			= 3,

	.id			= PLAT8250_DEV_PLATFORM,

	.dev			= {

		.platform_data	= serial_platform_data,

	},

arch/arm/mach-omap2/board-zoom-peripherals.c

+0 −1
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ static void enable_board_wakeup_source(void) 
void __init zoom_peripherals_init(void)

{

	omap_i2c_init();

	omap_serial_init();

	usb_musb_init(&musb_board_data);

	enable_board_wakeup_source();

}