From 779c94ea0a9795e647ee1cfcf7775ef4fa1b2042 Mon Sep 17 00:00:00 2001 From: cym Date: Mon, 5 Aug 2013 18:26:06 +0800 Subject: [PATCH] RK3028A:fix compile err by ddr_freq.c --- arch/arm/plat-rk/ddr_freq.c | 7 +++++-- arch/arm/plat-rk/include/plat/ddr.h | 13 +++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/arm/plat-rk/ddr_freq.c b/arch/arm/plat-rk/ddr_freq.c index 5e8898184256..a431d7563396 100755 --- a/arch/arm/plat-rk/ddr_freq.c +++ b/arch/arm/plat-rk/ddr_freq.c @@ -211,8 +211,11 @@ static int _ddr_change_freq_(uint32_t nMHz,struct ddr_freq_t ddr_freq_t) } } +#ifdef CONFIG_ARCH_RK3026 + ret = ddr_change_freq(nMHz); +#else ret = ddr_change_freq_sram(nMHz,ddr_freq_t); - +#endif set_other_cpus_pause(false); out: @@ -625,7 +628,7 @@ static int ddrfreq_late_init(void) register_reboot_notifier(&ddrfreq_reboot_notifier); - pr_info("verion 3.1 20130805\n"); + pr_info("verion 3.1 20130805 1\n"); dprintk(DEBUG_DDR, "normal %luMHz video %luMHz video_low %luMHz dualview %luMHz idle %luMHz suspend %luMHz reboot %luMHz\n", ddr.normal_rate / MHZ, ddr.video_rate / MHZ, ddr.video_low_rate / MHZ, ddr.dualview_rate / MHZ, ddr.idle_rate / MHZ, ddr.suspend_rate / MHZ, ddr.reboot_rate / MHZ); diff --git a/arch/arm/plat-rk/include/plat/ddr.h b/arch/arm/plat-rk/include/plat/ddr.h index 219674c023aa..dfcab775ed43 100755 --- a/arch/arm/plat-rk/include/plat/ddr.h +++ b/arch/arm/plat-rk/include/plat/ddr.h @@ -143,18 +143,19 @@ #define DDR_TYPE DDR_LPDDR #endif -void __sramfunc ddr_suspend(void); -void __sramfunc ddr_resume(void); -//void __sramlocalfunc delayus(uint32_t us); -#if defined(CONFIG_ARCH_RK2928) || defined(CONFIG_ARCH_RK3026) -uint32_t __sramfunc ddr_change_freq(uint32_t nMHz); -#else struct ddr_freq_t { unsigned long screen_ft_us; unsigned long long t0; unsigned long long t1; unsigned long t2; }; + +void __sramfunc ddr_suspend(void); +void __sramfunc ddr_resume(void); +//void __sramlocalfunc delayus(uint32_t us); +#if defined(CONFIG_ARCH_RK2928) || defined(CONFIG_ARCH_RK3026) +uint32_t __sramfunc ddr_change_freq(uint32_t nMHz); +#else uint32_t ddr_change_freq(uint32_t nMHz); uint32_t __sramfunc ddr_change_freq_sram(uint32_t nMHz , struct ddr_freq_t ddr_freq_t); #endif -- 2.34.1