From 407e6a280044c9d1a512e9d544bbc0d12f48cca3 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 12 Sep 2012 12:26:30 +0200 Subject: [PATCH] serial: pxa: Implement default_serial_console in serial_pxa.c Implement weak default_serial_console() function in serial_pxa driver, which gets available in case CONFIG_SERIAL_MULTI is enabled. This will get helpful in subsequent patches, which will encapsulate PXA's struct serial_device instances in serial_pxa driver. Signed-off-by: Marek Vasut Cc: Marek Vasut Cc: Tom Rini --- drivers/serial/serial_pxa.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index 97e3f36997..ad2d77e324 100644 --- a/drivers/serial/serial_pxa.c +++ b/drivers/serial/serial_pxa.c @@ -36,6 +36,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -298,4 +299,19 @@ void pxa_puts_dev(unsigned int uart_index, const char *s) #ifndef CONFIG_SERIAL_MULTI pxa_uart(serial, UART) +#else +__weak struct serial_device *default_serial_console(void) +{ +#if CONFIG_CONS_INDEX == 1 + return &serial_hwuart_device; +#elif CONFIG_CONS_INDEX == 2 + return &serial_stuart_device; +#elif CONFIG_CONS_INDEX == 3 + return &serial_ffuart_device; +#elif CONFIG_CONS_INDEX == 4 + return &serial_btuart_device; +#else +#error "Bad CONFIG_CONS_INDEX." +#endif +} #endif -- 2.30.2