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

login
register
mail settings
Submitter Prafulla Wadaskar
Date Nov. 30, 2010, 11:02 a.m.
Message ID <1291114965-17100-6-git-send-email-prafulla@marvell.com>
Download mbox | patch
Permalink /patch/73570/
State Superseded
Headers show

Comments

Prafulla Wadaskar - Nov. 30, 2010, 11:02 a.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>
---
 drivers/serial/serial.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

Patch

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 1073ac0..c6b403b 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -23,15 +23,17 @@ 
 
 #include <common.h>
 
-#include <ns16550.h>
-#ifdef CONFIG_NS87308
-#include <ns87308.h>
-#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
+
+#include <ns16550.h>
+#ifdef CONFIG_NS87308
+#include <ns87308.h>
 #endif
 
 #if defined (CONFIG_SERIAL_MULTI)