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 faf62d4e75fbe9f4db3dffe1573046d3a92d40d1..199a8f4aa836f0fa4d03f2561d1465a8bcf2282b 100755 (executable)
--- 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 591381e2106b04b99ef3da90314c9f98aec7f189..8643d71feffaf78cad49d008e05235ebdf896ff5 100755 (executable)
--- 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);