ARM: S5P6442: Add serial port support

This patch adds UART serial port support for S5P6442.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/arch/arm/plat-s5p/dev-uart.c b/arch/arm/plat-s5p/dev-uart.c
index 23c75316d4917bafb8284aa66c4b0e8cd81c61d0..a89331ef4ae172b97d6f21aba05fd8cd80c7eb09 100644 (file)
--- a/arch/arm/plat-s5p/dev-uart.c
+++ b/arch/arm/plat-s5p/dev-uart.c
@@ -95,6 +95,7 @@ static struct resource s5p_uart2_resource[] = {
 };
 
 static struct resource s5p_uart3_resource[] = {
+#if CONFIG_SERIAL_SAMSUNG_UARTS > 3
        [0] = {
                .start  = S5P_PA_UART3,
                .end    = S5P_PA_UART3 + S5P_SZ_UART,
@@ -115,6 +116,7 @@ static struct resource s5p_uart3_resource[] = {
                .end    = IRQ_S5P_UART_ERR3,
                .flags  = IORESOURCE_IRQ,
        },
+#endif
 };
 
 struct s3c24xx_uart_resources s5p_uart_resources[] __initdata = {

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index b2157c36566dcfb0a340a79824b5b4493963a7b9..86590e9a92f5ad1465524a22295e9ffe8922756d 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -551,7 +551,7 @@ config SERIAL_S5PC100
 
 config SERIAL_S5PV210
        tristate "Samsung S5PV210 Serial port support"
-       depends on SERIAL_SAMSUNG && CPU_S5PV210
+       depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442)
        select SERIAL_SAMSUNG_UARTS_4
        default y
        help