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

Commit 0b3dc0e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  omap4: Fix UART4 platform data on omap4
  omap4: Allow omap_serial_early_init() for OMAP4430 board
  omap3: PM: enable UART3 module wakeups
  omap2: Fix console serial port number for n8x0
  omap2: Fix detection of n8x0
  omap1: Fix DSP public peripherals support for ams-delta
  omap1: Fix redundant UARTs pin muxing that can break other hardware support
  omap: iommu: fix wrong condition check for SUPERSECTION
  omap: SDMA: Fix omap_stop_dma() API for channel linking
  omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards that use matrix_keypad
parents 59f41227 54341c9b

arch/arm/configs/n8x0_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ CONFIG_ALIGNMENT_TRAP=y 
CONFIG_ZBOOT_ROM_TEXT=0x10C08000

CONFIG_ZBOOT_ROM_BSS=0x10200000

# CONFIG_ZBOOT_ROM is not set

CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 console=ttyS0,115200n8"

CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 console=ttyS2,115200n8"

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set

arch/arm/mach-omap1/board-ams-delta.c

+6 −0
Original line number Diff line number Diff line
@@ -219,6 +219,10 @@ static struct platform_device *ams_delta_devices[] __initdata = { 


static void __init ams_delta_init(void)

{

	/* mux pins for uarts */

	omap_cfg_reg(UART1_TX);

	omap_cfg_reg(UART1_RTS);



	iotable_init(ams_delta_io_desc, ARRAY_SIZE(ams_delta_io_desc));



	omap_board_config = ams_delta_config;
@@ -231,6 +235,8 @@ static void __init ams_delta_init(void) 


	omap_usb_init(&ams_delta_usb_config);

	platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));



	omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1);

}



static struct plat_serial8250_port ams_delta_modem_ports[] = {

arch/arm/mach-omap1/board-generic.c

+8 −0
Original line number Diff line number Diff line
@@ -64,6 +64,14 @@ static void __init omap_generic_init(void) 
{

#ifdef CONFIG_ARCH_OMAP15XX

	if (cpu_is_omap15xx()) {

		/* mux pins for uarts */

		omap_cfg_reg(UART1_TX);

		omap_cfg_reg(UART1_RTS);

		omap_cfg_reg(UART2_TX);

		omap_cfg_reg(UART2_RTS);

		omap_cfg_reg(UART3_TX);

		omap_cfg_reg(UART3_RX);



		omap_usb_init(&generic1510_usb_config);

	}

#endif

arch/arm/mach-omap1/board-innovator.c

+20 −0
Original line number Diff line number Diff line
@@ -376,6 +376,26 @@ static void __init innovator_init(void) 
{

#ifdef CONFIG_ARCH_OMAP15XX

	if (cpu_is_omap1510()) {

		unsigned char reg;



		/* mux pins for uarts */

		omap_cfg_reg(UART1_TX);

		omap_cfg_reg(UART1_RTS);

		omap_cfg_reg(UART2_TX);

		omap_cfg_reg(UART2_RTS);

		omap_cfg_reg(UART3_TX);

		omap_cfg_reg(UART3_RX);



		reg = fpga_read(OMAP1510_FPGA_POWER);

		reg |= OMAP1510_FPGA_PCR_COM1_EN;

		fpga_write(reg, OMAP1510_FPGA_POWER);

		udelay(10);



		reg = fpga_read(OMAP1510_FPGA_POWER);

		reg |= OMAP1510_FPGA_PCR_COM2_EN;

		fpga_write(reg, OMAP1510_FPGA_POWER);

		udelay(10);



		platform_add_devices(innovator1510_devices, ARRAY_SIZE(innovator1510_devices));

		spi_register_board_info(innovator1510_boardinfo,

				ARRAY_SIZE(innovator1510_boardinfo));

arch/arm/mach-omap1/board-palmte.c

+8 −0
Original line number Diff line number Diff line
@@ -342,6 +342,14 @@ static void __init palmte_misc_gpio_setup(void) 


static void __init omap_palmte_init(void)

{

	/* mux pins for uarts */

	omap_cfg_reg(UART1_TX);

	omap_cfg_reg(UART1_RTS);

	omap_cfg_reg(UART2_TX);

	omap_cfg_reg(UART2_RTS);

	omap_cfg_reg(UART3_TX);

	omap_cfg_reg(UART3_RX);



	omap_board_config = palmte_config;

	omap_board_config_size = ARRAY_SIZE(palmte_config);