Patchwork [U-Boot,v3,5/7] Serial: Add UART support for Marvell ARMADA 100 SoCs.

login
register
mail settings
Submitter Prafulla Wadaskar
Date Dec. 1, 2010, 2:58 p.m.
Message ID <1291215531-14068-6-git-send-email-prafulla@marvell.com>
Download mbox | patch
Permalink /patch/73788/
State Accepted
Commit a042ec33b7747b576d2a5247cba5ae7885b3db4e
Headers show

Comments

Prafulla Wadaskar - Dec. 1, 2010, 2:58 p.m.
ARMADA 100 SoCs has NS16550 compatible UART peripheral
This patch enables the same for ARMADA100 platforms

Signed-off-by: Mahavir Jain <mjain@marvell.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>

---
Change log for v2:
defined CONFIG_SYS_NS16550_IER macro in Soc heder file
Change log for v3:
Removed reordiring of header files, the diff is only
limited to include armada100.h

 drivers/serial/serial.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 1073ac0..cd3439e 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -29,9 +29,10 @@ 
 #endif
 #ifdef CONFIG_KIRKWOOD
 #include <asm/arch/kirkwood.h>
-#endif
-#ifdef CONFIG_ORION5X
+#elif defined(CONFIG_ORION5X)
 #include <asm/arch/orion5x.h>
+#elif defined(CONFIG_ARMADA100)
+#include <asm/arch/armada100.h>
 #endif
 
 #if defined (CONFIG_SERIAL_MULTI)