|
|
@@ -49,11 +49,6 @@ struct ar933x_uart_port {
|
|
|
struct clk *clk;
|
|
|
};
|
|
|
|
|
|
-static inline bool ar933x_uart_console_enabled(void)
|
|
|
-{
|
|
|
- return IS_ENABLED(CONFIG_SERIAL_AR933X_CONSOLE);
|
|
|
-}
|
|
|
-
|
|
|
static inline unsigned int ar933x_uart_read(struct ar933x_uart_port *up,
|
|
|
int offset)
|
|
|
{
|
|
|
@@ -508,6 +503,7 @@ static const struct uart_ops ar933x_uart_ops = {
|
|
|
.verify_port = ar933x_uart_verify_port,
|
|
|
};
|
|
|
|
|
|
+#ifdef CONFIG_SERIAL_AR933X_CONSOLE
|
|
|
static struct ar933x_uart_port *
|
|
|
ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS];
|
|
|
|
|
|
@@ -604,14 +600,7 @@ static struct console ar933x_uart_console = {
|
|
|
.index = -1,
|
|
|
.data = &ar933x_uart_driver,
|
|
|
};
|
|
|
-
|
|
|
-static void ar933x_uart_add_console_port(struct ar933x_uart_port *up)
|
|
|
-{
|
|
|
- if (!ar933x_uart_console_enabled())
|
|
|
- return;
|
|
|
-
|
|
|
- ar933x_console_ports[up->port.line] = up;
|
|
|
-}
|
|
|
+#endif /* CONFIG_SERIAL_AR933X_CONSOLE */
|
|
|
|
|
|
static struct uart_driver ar933x_uart_driver = {
|
|
|
.owner = THIS_MODULE,
|
|
|
@@ -700,7 +689,9 @@ static int ar933x_uart_probe(struct platform_device *pdev)
|
|
|
baud = ar933x_uart_get_baud(port->uartclk, 0, AR933X_UART_MAX_STEP);
|
|
|
up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD);
|
|
|
|
|
|
- ar933x_uart_add_console_port(up);
|
|
|
+#ifdef CONFIG_SERIAL_AR933X_CONSOLE
|
|
|
+ ar933x_console_ports[up->port.line] = up;
|
|
|
+#endif
|
|
|
|
|
|
ret = uart_add_one_port(&ar933x_uart_driver, &up->port);
|
|
|
if (ret)
|
|
|
@@ -749,8 +740,9 @@ static int __init ar933x_uart_init(void)
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
|
- if (ar933x_uart_console_enabled())
|
|
|
- ar933x_uart_driver.cons = &ar933x_uart_console;
|
|
|
+#ifdef CONFIG_SERIAL_AR933X_CONSOLE
|
|
|
+ ar933x_uart_driver.cons = &ar933x_uart_console;
|
|
|
+#endif
|
|
|
|
|
|
ret = uart_register_driver(&ar933x_uart_driver);
|
|
|
if (ret)
|