summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2016-06-25 08:47:33 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-07-06 19:30:48 +1000
commit5740d2eb91303715fd077cf2deb7347fb1173e69 (patch)
tree4d94871c8569aa11023972eb7d1368775729f58a /include
parent53a9d925e2832cebb8814df47f949b01ce9b24ff (diff)
downloadtalos-skiboot-5740d2eb91303715fd077cf2deb7347fb1173e69.tar.gz
talos-skiboot-5740d2eb91303715fd077cf2deb7347fb1173e69.zip
uart: Cleanup initialization and remove simulator hack
Add more generic support for MMIO based UARTs, simplify code, use common initialization, and clean up the device-tree representation as well. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'include')
-rw-r--r--include/console.h1
-rw-r--r--include/skiboot.h3
2 files changed, 2 insertions, 2 deletions
diff --git a/include/console.h b/include/console.h
index ecb18c42..b6fc8bfa 100644
--- a/include/console.h
+++ b/include/console.h
@@ -67,7 +67,6 @@ extern void console_complete_flush(void);
extern int mambo_read(void);
extern void mambo_write(const char *buf, size_t count);
extern void enable_mambo_console(void);
-extern void enable_simics_console(void);
ssize_t console_write(bool flush_to_drivers, const void *buf, size_t count);
diff --git a/include/skiboot.h b/include/skiboot.h
index ded6bb8e..1d33389b 100644
--- a/include/skiboot.h
+++ b/include/skiboot.h
@@ -203,7 +203,7 @@ extern void probe_phb3(void);
extern int phb3_preload_capp_ucode(void);
extern void phb3_preload_vpd(void);
extern void probe_npu(void);
-extern void uart_init(bool enable_interrupt);
+extern void uart_init(void);
extern void homer_init(void);
extern void occ_pstates_init(void);
extern void slw_init(void);
@@ -228,6 +228,7 @@ extern void nvram_read_complete(bool success);
/* UART stuff */
extern void uart_setup_linux_passthrough(void);
extern void uart_setup_opal_console(void);
+extern bool uart_enabled(void);
/* OCC interrupt */
extern void occ_interrupt(uint32_t chip_id);
OpenPOWER on IntegriCloud