Clean up and document UART config options

No functional changes, just renaming config options.

BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms

Change-Id: I91584cb1f8990dd0f980abd32c04465a66243e71
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63244

1 files changed, 21 insertions, 22 deletions

diff --git a/chip/lm4/uart.c b/chip/lm4/uart.c
index 1e7df2f0a3..15b83e5551 100644
--- a/chip/lm4/uart.c
+++ b/chip/lm4/uart.c
@@ -14,8 +14,7 @@
 #include "uart.h"
 #include "util.h"
 
-/* Baud rate for UARTs */
-#define BAUD_RATE 115200
+#define CONFIG_UART_HOST_IRQ CONCAT2(LM4_IRQ_UART, CONFIG_UART_HOST)
 
 static int init_done;
 
@@ -114,17 +113,17 @@ DECLARE_IRQ(LM4_IRQ_UART0, uart_ec_interrupt, 1);
 static void uart_host_interrupt(void)
 {
 	/* Clear transmit and receive interrupt status */
-	LM4_UART_ICR(CONFIG_HOST_UART) = 0x70;
+	LM4_UART_ICR(CONFIG_UART_HOST) = 0x70;
 
 #ifdef CONFIG_LPC
 	/*
 	 * If we have space in our FIFO and a character is pending in LPC,
 	 * handle that character.
 	 */
-	if (!(LM4_UART_FR(CONFIG_HOST_UART) & 0x20) && lpc_comx_has_char()) {
+	if (!(LM4_UART_FR(CONFIG_UART_HOST) & 0x20) && lpc_comx_has_char()) {
 		/* Copy the next byte then disable transmit interrupt */
-		LM4_UART_DR(CONFIG_HOST_UART) = lpc_comx_get_char();
-		LM4_UART_IM(CONFIG_HOST_UART) &= ~0x20;
+		LM4_UART_DR(CONFIG_UART_HOST) = lpc_comx_get_char();
+		LM4_UART_IM(CONFIG_UART_HOST) &= ~0x20;
 	}
 
 	/*
@@ -133,12 +132,12 @@ static void uart_host_interrupt(void)
 	 * because LPC is much faster than UART, and we don't have flow control
 	 * on the UART receive-side either.
 	 */
-	if (!(LM4_UART_FR(CONFIG_HOST_UART) & 0x10))
-		lpc_comx_put_char(LM4_UART_DR(CONFIG_HOST_UART));
+	if (!(LM4_UART_FR(CONFIG_UART_HOST) & 0x10))
+		lpc_comx_put_char(LM4_UART_DR(CONFIG_UART_HOST));
 #endif
 }
 /* Must be same prio as LPC interrupt handler so they don't preempt */
-DECLARE_IRQ(CONFIG_HOST_UART_IRQ, uart_host_interrupt, 2);
+DECLARE_IRQ(CONFIG_UART_HOST_IRQ, uart_host_interrupt, 2);
 
 /**
  * Configure GPIOs for the UART module.
@@ -148,13 +147,13 @@ static void configure_gpio(void)
 	/* UART0 RX and TX are GPIO PA0:1 alternate function 1 */
 	gpio_set_alternate_function(LM4_GPIO_A, 0x03, 1);
 
-#if defined(CONFIG_HOST_UART1_GPIOS_PC4_5)
+#if (CONFIG_UART_HOST == 1) && defined(CONFIG_UART_HOST_GPIOS_PC4_5)
 	/* UART1 RX and TX are GPIO PC4:5 alternate function 2 */
 	gpio_set_alternate_function(LM4_GPIO_C, 0x30, 2);
-#elif defined(CONFIG_HOST_UART1_GPIOS_PB0_1)
+#elif (CONFIG_UART_HOST == 1) && defined(CONFIG_UART_HOST_GPIOS_PB0_1)
 	/* UART1 RX and TX are GPIO PB0:1 alternate function 1 */
 	gpio_set_alternate_function(LM4_GPIO_B, 0x03, 1);
-#elif defined(CONFIG_HOST_UART2_GPIOS_PG4_5)
+#elif (CONFIG_UART_HOST == 2) && defined(CONFIG_UART_HOST_GPIOS_PG4_5)
 	/* UART2 RX and TX are GPIO PG4:5 alternate function 1 */
 	gpio_set_alternate_function(LM4_GPIO_G, 0x30, 1);
 #else
@@ -169,10 +168,10 @@ static void uart_config(int port)
 	/* Use the internal oscillator */
 	LM4_UART_CC(port) = 0x1;
 	/* Set the baud rate divisor */
-	LM4_UART_IBRD(port) = (INTERNAL_CLOCK / 16) / BAUD_RATE;
+	LM4_UART_IBRD(port) = (INTERNAL_CLOCK / 16) / CONFIG_UART_BAUD_RATE;
 	LM4_UART_FBRD(port) =
-		(((INTERNAL_CLOCK / 16) % BAUD_RATE) * 64
-		 + BAUD_RATE / 2) / BAUD_RATE;
+		(((INTERNAL_CLOCK / 16) % CONFIG_UART_BAUD_RATE) * 64
+		 + CONFIG_UART_BAUD_RATE / 2) / CONFIG_UART_BAUD_RATE;
 	/*
 	 * 8-N-1, FIFO enabled.  Must be done after setting
 	 * the divisor for the new divisor to take effect.
@@ -199,7 +198,7 @@ void uart_init(void)
 	volatile uint32_t scratch  __attribute__((unused));
 
 	/* Enable UART0 and Host UART and delay a few clocks */
-	LM4_SYSTEM_RCGCUART |= (1 << CONFIG_HOST_UART) | 1;
+	LM4_SYSTEM_RCGCUART |= (1 << CONFIG_UART_HOST) | 1;
 	scratch = LM4_SYSTEM_RCGCUART;
 
 	/* Configure GPIOs */
@@ -207,7 +206,7 @@ void uart_init(void)
 
 	/* Configure UARTs (identically) */
 	uart_config(0);
-	uart_config(CONFIG_HOST_UART);
+	uart_config(CONFIG_UART_HOST);
 
 	/*
 	 * Enable interrupts for UART0 only. Host UART will have to wait
@@ -224,18 +223,18 @@ void uart_init(void)
 
 void uart_comx_enable(void)
 {
-	uart_clear_rx_fifo(CONFIG_HOST_UART);
-	task_enable_irq(CONFIG_HOST_UART_IRQ);
+	uart_clear_rx_fifo(CONFIG_UART_HOST);
+	task_enable_irq(CONFIG_UART_HOST_IRQ);
 }
 
 int uart_comx_putc_ok(void)
 {
-	if (LM4_UART_FR(CONFIG_HOST_UART) & 0x20) {
+	if (LM4_UART_FR(CONFIG_UART_HOST) & 0x20) {
 		/*
 		 * FIFO is full, so enable transmit interrupt to let us know
 		 * when it empties.
 		 */
-		LM4_UART_IM(CONFIG_HOST_UART) |= 0x20;
+		LM4_UART_IM(CONFIG_UART_HOST) |= 0x20;
 		return 0;
 	} else {
 		return 1;
@@ -244,7 +243,7 @@ int uart_comx_putc_ok(void)
 
 void uart_comx_putc(int c)
 {
-	LM4_UART_DR(CONFIG_HOST_UART) = c;
+	LM4_UART_DR(CONFIG_UART_HOST) = c;
 }
 
 /*****************************************************************************/