aboutsummaryrefslogtreecommitdiff
path: root/platforms
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2017-02-03 20:51:56 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-02-07 14:15:54 +1100
commit5bd0f9c20481a886a5367cf0ccd9b92b7e0feb87 (patch)
tree8c88bf39b48415df4e1aaea8533ab7103d20971e /platforms
parent0500d504b13eb95046bcea9b17ad6787ff18e843 (diff)
downloadskiboot-5bd0f9c20481a886a5367cf0ccd9b92b7e0feb87.zip
skiboot-5bd0f9c20481a886a5367cf0ccd9b92b7e0feb87.tar.gz
skiboot-5bd0f9c20481a886a5367cf0ccd9b92b7e0feb87.tar.bz2
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 <benh@kernel.crashing.org> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'platforms')
-rw-r--r--platforms/astbmc/zaius.c3
-rw-r--r--platforms/rhesus/rhesus.c2
2 files changed, 4 insertions, 1 deletions
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)