From 5bd0f9c20481a886a5367cf0ccd9b92b7e0feb87 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Fri, 3 Feb 2017 20:51:56 +1100 Subject: uart: Fix Linux pass-through policy This was broken on Rhesus. Also add an nvram way of overriding the policy Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Stewart Smith --- platforms/astbmc/zaius.c | 3 +++ platforms/rhesus/rhesus.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'platforms') diff --git a/platforms/astbmc/zaius.c b/platforms/astbmc/zaius.c index 7770d07..038a08c 100644 --- a/platforms/astbmc/zaius.c +++ b/platforms/astbmc/zaius.c @@ -33,6 +33,9 @@ static bool zaius_probe(void) astbmc_early_init(); psi_set_external_irq_policy(EXTERNAL_IRQ_POLICY_LINUX); + /* Setup UART for direct use by Linux */ + uart_set_console_policy(UART_CONSOLE_OS); + return true; } diff --git a/platforms/rhesus/rhesus.c b/platforms/rhesus/rhesus.c index c96f120..0571e22 100644 --- a/platforms/rhesus/rhesus.c +++ b/platforms/rhesus/rhesus.c @@ -154,7 +154,7 @@ static void rhesus_init(void) rhesus_pnor_init(); /* Setup UART for direct use by Linux */ - uart_setup_linux_passthrough(); + uart_set_console_policy(UART_CONSOLE_OS); } static void rhesus_dt_fixup_uart(struct dt_node *lpc, bool has_irq) -- cgit v1.1