commit 3bd4b79c8c7ab1a333ee322d703a62b0e40cee20
author Linux Build Service Account <lnxbuild@localhost> Sat Oct 10 03:41:06 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Oct 10 03:41:06 2015 -0700
tree 6a3f064ae4ce62ac0b444dc94b101b22ebd41df8
parent 16d0e0bad654546ce0f3aaf779c29c58fbc3c547
parent 97f0027c2bd04ec5d36c0c3b04c20dde7e4ce1e0

Merge "target/platform: mdmfermium: change to support UART5"

platform/mdmfermium/gpio.c

diff --git a/platform/mdmfermium/gpio.c b/platform/mdmfermium/gpio.c
index fba2c76..6f9bc3c 100644
--- a/platform/mdmfermium/gpio.c
+++ b/platform/mdmfermium/gpio.c
@@ -68,10 +68,10 @@
 void gpio_config_uart_dm(uint8_t id)
 {
 	/* configure rx gpio */
-	gpio_tlmm_config(5, 2, GPIO_INPUT, GPIO_NO_PULL,
+	gpio_tlmm_config(9, 2, GPIO_INPUT, GPIO_NO_PULL,
 				GPIO_8MA, GPIO_DISABLE);
 
 	/* configure tx gpio */
-	gpio_tlmm_config(4, 2, GPIO_OUTPUT, GPIO_NO_PULL,
+	gpio_tlmm_config(8, 2, GPIO_OUTPUT, GPIO_NO_PULL,
 				GPIO_8MA, GPIO_DISABLE);
 }

platform/mdmfermium/include/platform/iomap.h

diff --git a/platform/mdmfermium/include/platform/iomap.h b/platform/mdmfermium/include/platform/iomap.h
index 852e5a9..d1eb89e 100644
--- a/platform/mdmfermium/include/platform/iomap.h
+++ b/platform/mdmfermium/include/platform/iomap.h
@@ -64,6 +64,7 @@
 
 #define BLSP1_UART0_BASE                   (PERIPH_SS_BASE + 0x000AF000)
 #define BLSP1_UART1_BASE                   (PERIPH_SS_BASE + 0x000B0000)
+#define BLSP1_UART5_BASE                   (PERIPH_SS_BASE + 0x000B3000)
 #define MSM_USB_BASE                       (PERIPH_SS_BASE + 0x000D9000)
 
 #define CLK_CTL_BASE                       0x1800000

target/mdmfermium/init.c

diff --git a/target/mdmfermium/init.c b/target/mdmfermium/init.c
index 4bad773..65d1b0a 100644
--- a/target/mdmfermium/init.c
+++ b/target/mdmfermium/init.c
@@ -118,7 +118,7 @@
 void target_early_init(void)
 {
 #if WITH_DEBUG_UART
-	uart_dm_init(1, 0, BLSP1_UART1_BASE);
+	uart_dm_init(1, 0, BLSP1_UART5_BASE);
 #endif
 }