From: 陈亮 <cl@rock-chips.com>
Date: Fri, 15 Aug 2014 03:12:22 +0000 (-0700)
Subject: rk312x: clk_ddr enable dvfs
X-Git-Tag: firefly_0821_release~4884
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c6431eb27537a8c29f93cd9b87b9fc3aaa256f1c;p=firefly-linux-kernel-4.4.55.git

rk312x: clk_ddr enable dvfs

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

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index faf62d4e75fb..199a8f4aa836 100755
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -425,7 +425,7 @@
 		528000
 		>;
 	auto-freq=<0>;
-	status="disable";
+	status="okay";
 };
 
 &pwm0 {
diff --git a/arch/arm/mach-rockchip/rk312x.c b/arch/arm/mach-rockchip/rk312x.c
index 591381e2106b..8643d71feffa 100755
--- a/arch/arm/mach-rockchip/rk312x.c
+++ b/arch/arm/mach-rockchip/rk312x.c
@@ -67,6 +67,7 @@ static struct map_desc rk312x_io_desc[] __initdata = {
 	RK312X_DEVICE(ROM),
 	RK312X_DEVICE(EFUSE),
 	RK312X_DEVICE(TIMER),
+	RK312X_DEVICE(CPU_AXI_BUS),
 	RK_DEVICE(RK_DEBUG_UART_VIRT, RK312X_UART2_PHYS, RK312X_UART_SIZE),
 	RK_DEVICE(RK_DDR_VIRT, RK312X_DDR_PCTL_PHYS, RK312X_DDR_PCTL_SIZE),
 	RK_DEVICE(RK_DDR_VIRT + RK312X_DDR_PCTL_SIZE, RK312X_DDR_PHY_PHYS, RK312X_DDR_PHY_SIZE),
@@ -255,3 +256,15 @@ static int __init rk312x_pie_init(void)
 	return 0;
 }
 arch_initcall(rk312x_pie_init);
+#include "ddr_rk3126.c"
+static int __init rk312x_ddr_init(void)
+{
+	if (cpu_is_rk312x()) {
+		ddr_change_freq = _ddr_change_freq;
+		ddr_round_rate = _ddr_round_rate;
+		ddr_set_auto_self_refresh = _ddr_set_auto_self_refresh;
+		ddr_init(DDR3_DEFAULT, 300);
+		}
+	return 0;
+}
+arch_initcall_sync(rk312x_ddr_init);