Tony Lindgren <[email protected]> writes:
> Use omap_serial_init_port so we can let the serial code handle the
> remuxing of the RX pads.
>
> Signed-off-by: Tony Lindgren <[email protected]>
Does this work for UART wakeups on n810? I don't see any 'idle' value
for the pads, so I'm guessing it wont work without those, right? Or am
I missing something here.
Kevin
> ---
> arch/arm/mach-omap2/board-n8x0.c | 66
> ++++++++++++++++++++++++++++++++++++--
> 1 files changed, 63 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-n8x0.c
> b/arch/arm/mach-omap2/board-n8x0.c
> index d022301..e3429b4 100644
> --- a/arch/arm/mach-omap2/board-n8x0.c
> +++ b/arch/arm/mach-omap2/board-n8x0.c
> @@ -29,6 +29,7 @@
>
> #include <plat/board.h>
> #include <plat/common.h>
> +#include <plat/omap_device.h>
> #include <plat/menelaus.h>
> #include <mach/irqs.h>
> #include <plat/mcspi.h>
> @@ -754,8 +755,68 @@ static struct omap_board_mux board_mux[] __initdata = {
> OMAP2420_MUX(EAC_AC_DOUT, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
> { .reg_offset = OMAP_MUX_TERMINATOR },
> };
> +
> +static struct omap_device_pad serial0_pads[] __initdata = {
> + { .name = "uart1_rx.uart1_rx", .enable = OMAP_MUX_MODE0 },
> + { .name = "uart1_tx.uart1_tx", .enable = OMAP_MUX_MODE0 },
> +};
> +
> +static struct omap_device_pad n800_serial1_pads[] __initdata = {
> + { .name = "uart2_rx.uart2_rx", .enable = OMAP_MUX_MODE7, },
> + {
> + .name = "uart2_tx.uart2_tx",
> + .enable = OMAP_PULL_ENA | OMAP_MUX_MODE7,
> + },
> +};
> +
> +static struct omap_device_pad n810_serial1_pads[] __initdata = {
> + { .name = "uart2_rx.uart2_rx", .enable = OMAP_MUX_MODE0, },
> + { .name = "uart2_tx.uart2_tx", .enable = OMAP_MUX_MODE0, },
> +};
> +
> +static struct omap_device_pad serial2_pads[] __initdata = {
> + {
> + .name = "uart3_rx_irrx.uart3_rx_irrx",
> + .flags = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
> + .enable = OMAP_MUX_MODE0,
> + .idle = OMAP_MUX_MODE3 /* Mux as GPIO for idle */
> + },
> + { .name = "uart3_tx_irtx.uart3_tx_irtx", .enable = OMAP_MUX_MODE0, },
> +};
> +
> +static struct omap_device_board_data serial0_data = {
> + .id = 0,
> + .pads = serial0_pads,
> + .pads_cnt = ARRAY_SIZE(serial0_pads),
> +};
> +
> +static struct omap_device_board_data serial1_data = {
> + .id = 1,
> +};
> +
> +static struct omap_device_board_data serial2_data = {
> + .id = 2,
> + .pads = serial2_pads,
> + .pads_cnt = ARRAY_SIZE(serial2_pads),
> +};
> +
> +static inline void board_serial_init(int is_n800)
> +{
> + if (is_n800) {
> + serial1_data.pads = n800_serial1_pads;
> + serial1_data.pads_cnt = ARRAY_SIZE(n800_serial1_pads);
> + } else {
> + serial1_data.pads = n810_serial1_pads;
> + serial1_data.pads_cnt = ARRAY_SIZE(n810_serial1_pads);
> + }
> + omap_serial_init_port(&serial0_data);
> + omap_serial_init_port(&serial1_data);
> + omap_serial_init_port(&serial2_data);
> +}
> #else
> -#define board_mux NULL
> +static inline void board_serial_init(void)
> + omap_serial_init();
> +}
> #endif
>
> static void __init n8x0_init_machine(void)
> @@ -772,8 +833,7 @@ static void __init n8x0_init_machine(void)
> if (machine_is_nokia_n810())
> i2c_register_board_info(2, n810_i2c_board_info_2,
> ARRAY_SIZE(n810_i2c_board_info_2));
> -
> - omap_serial_init();
> + board_serial_init(machine_is_nokia_n800());
> n8x0_onenand_init();
> n8x0_mmc_init();
> n8x0_usb_init();
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
