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

Commit c33da3a8 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Tony Lindgren
Browse files

omap1: Fix redundant UARTs pin muxing that can break other hardware support 



Commit 15ac408e removed enabled_uart
and OMAP_TAG_UART. This works for mach-omap2, but causes issues on
mach-omap1 for some boards as the mach-omap1 serial.c was muxing
pins based on the enabled_uart flag for 15xx.

Fix this by muxing pins in board-*.c files for the 15xx boards for
the uart ports that had enabled_uart flag set before the commit
above.

Tested on Amsdtrad Delta only.

Note that in the future we should add support for powering down
the uarts with a timer like mach-omap2/serial.c does. Otherwise
the enabled uarts will be blocking retention-while-idle.

Signed-off-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent dcc730dc

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

+4 −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;

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

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

+8 −0
Original line number Diff line number Diff line
@@ -289,6 +289,14 @@ static void __init omap_mpu_wdt_mode(int mode) { 


static void __init omap_palmtt_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_mpu_wdt_mode(0);



	omap_board_config = palmtt_config;