From 462c8350f6ed6b950609de1f72f00098440d3354 Mon Sep 17 00:00:00 2001 From: Soby Mathew Date: Mon, 14 Jul 2014 15:43:21 +0100 Subject: Parametrize baudrate and UART clock during console_init() This patch adds baud rate and UART clock frequency as parameters to the pl011 driver api console_init(). This allows each platform to specify UART clock and baud rate according to their specific hardware implementation. Fixes ARM-software/tf-issues#215 Change-Id: Id13eef70a1c530e709b34dd1e6eb84db0797ced2 --- include/drivers/arm/pl011.h | 8 -------- include/drivers/console.h | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'include/drivers') diff --git a/include/drivers/arm/pl011.h b/include/drivers/arm/pl011.h index e01d8b2..7c4df62 100644 --- a/include/drivers/arm/pl011.h +++ b/include/drivers/arm/pl011.h @@ -78,14 +78,6 @@ #define PL011_UARTCR_LBE (1 << 7) /* Loopback enable */ #define PL011_UARTCR_UARTEN (1 << 0) /* UART Enable */ -#if !defined(PL011_BAUDRATE) -#define PL011_BAUDRATE 115200 -#endif - -#if !defined(PL011_CLK_IN_HZ) -#define PL011_CLK_IN_HZ 24000000 -#endif - #if !defined(PL011_LINE_CONTROL) /* FIFO Enabled / No Parity / 8 Data bit / One Stop Bit */ #define PL011_LINE_CONTROL (PL011_UARTLCR_H_FEN | PL011_UARTLCR_H_WLEN_8) diff --git a/include/drivers/console.h b/include/drivers/console.h index e285909..f144ab9 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -31,7 +31,8 @@ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ -void console_init(unsigned long base_addr); +int console_init(unsigned long base_addr, + unsigned int uart_clk, unsigned int baud_rate); int console_putc(int c); int console_getc(void); -- cgit v1.2.3