From: 陈亮 <cl@rock-chips.com>
Date: Mon, 18 Aug 2014 06:37:05 +0000 (-0700)
Subject: rk312x: iomap PMU register
X-Git-Tag: firefly_0821_release~4870
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c84f321f6f3939e6e9cd023af36b04661cdb1251;p=firefly-linux-kernel-4.4.55.git

rk312x: iomap PMU register

Signed-off-by: 陈亮 <cl@rock-chips.com>
---

diff --git a/arch/arm/mach-rockchip/rk312x.c b/arch/arm/mach-rockchip/rk312x.c
index 8643d71feffa..f0553914a1bb 100755
--- a/arch/arm/mach-rockchip/rk312x.c
+++ b/arch/arm/mach-rockchip/rk312x.c
@@ -65,6 +65,7 @@ static struct map_desc rk312x_io_desc[] __initdata = {
 	RK312X_DEVICE(CRU),
 	RK312X_DEVICE(GRF),
 	RK312X_DEVICE(ROM),
+	RK312X_DEVICE(PMU),
 	RK312X_DEVICE(EFUSE),
 	RK312X_DEVICE(TIMER),
 	RK312X_DEVICE(CPU_AXI_BUS),
@@ -77,7 +78,7 @@ static struct map_desc rk312x_io_desc[] __initdata = {
 	RK_DEVICE(RK_GPIO_VIRT(3), RK312X_GPIO3_PHYS, RK312X_GPIO_SIZE),
 	RK_DEVICE(RK_GIC_VIRT, RK312X_GIC_DIST_PHYS, RK312X_GIC_DIST_SIZE),
 	RK_DEVICE(RK_GIC_VIRT + RK312X_GIC_DIST_SIZE, RK312X_GIC_CPU_PHYS, RK312X_GIC_CPU_SIZE),
-	RK_DEVICE(RK312X_IMEM_VIRT, RK312X_IMEM_PHYS, SZ_4K),
+	RK_DEVICE(RK312X_IMEM_VIRT, RK312X_IMEM_PHYS, RK312X_IMEM_SIZE),
 };
 static void usb_uart_init(void)
 {
diff --git a/include/linux/rockchip/iomap.h b/include/linux/rockchip/iomap.h
index 1adbcb294187..276ce2c7394b 100755
--- a/include/linux/rockchip/iomap.h
+++ b/include/linux/rockchip/iomap.h
@@ -175,5 +175,7 @@
 #define RK312X_GPIO_SIZE                RK3036_GPIO_SIZE
 #define RK312X_EFUSE_PHYS               RK3036_EFUSE_PHYS
 #define RK312X_EFUSE_SIZE               RK3036_EFUSE_SIZE
+#define RK312X_PMU_PHYS			0x100a0000
+#define RK312X_PMU_SIZE			SZ_64K
 
 #endif