From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 13 Jan 2014 03:14:11 +0000 (+0800)
Subject: ARM: rockchip: rk3188 add uart2 static iomap
X-Git-Tag: firefly_0821_release~6391
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=39c51fba661a377dd9e6a2c0a7d9a883f998458a;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip: rk3188 add uart2 static iomap
---

diff --git a/arch/arm/mach-rockchip/iomap.h b/arch/arm/mach-rockchip/iomap.h
index d153568f6269..6cbc5c1e1612 100644
--- a/arch/arm/mach-rockchip/iomap.h
+++ b/arch/arm/mach-rockchip/iomap.h
@@ -1,6 +1,8 @@
 #ifndef __MACH_ROCKCHIP_IOMAP_H
 #define __MACH_ROCKCHIP_IOMAP_H
 
+#include <asm/io.h>
+
 #define RK_IO_ADDRESS(x)        IOMEM(0xFED00000 + x)
 
 #define RK_CRU_VIRT             RK_IO_ADDRESS(0x00000000)
@@ -38,5 +40,13 @@
 #define RK3188_DDR_PCTL_SIZE    SZ_16K
 #define RK3188_DDR_PUBL_PHYS    0x20040000
 #define RK3188_DDR_PUBL_SIZE    SZ_16K
+#define RK3188_UART0_PHYS       0x10124000
+#define RK3188_UART0_SIZE       SZ_4K
+#define RK3188_UART1_PHYS       0x10126000
+#define RK3188_UART1_SIZE       SZ_4K
+#define RK3188_UART2_PHYS       0x20064000
+#define RK3188_UART2_SIZE       SZ_4K
+#define RK3188_UART3_PHYS       0x20068000
+#define RK3188_UART3_SIZE       SZ_4K
 
 #endif
diff --git a/arch/arm/mach-rockchip/rk3188.c b/arch/arm/mach-rockchip/rk3188.c
index 665770077c7a..1dc806d9d5ea 100644
--- a/arch/arm/mach-rockchip/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188.c
@@ -81,6 +81,12 @@ static struct map_desc rk3188_io_desc[] __initdata = {
 		.length		= RK3188_GPIO_SIZE,
 		.type		= MT_DEVICE,
 	},
+	{
+		.virtual	= (unsigned long) RK_DEBUG_UART_VIRT,
+		.pfn		= __phys_to_pfn(RK3188_UART2_PHYS),
+		.length		= RK3188_UART2_SIZE,
+		.type		= MT_DEVICE,
+	},
 };
 
 static void __init rk3188_dt_map_io(void)