shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0

Browse Source
This commit is contained in:
xbw
2013-01-22 17:59:07 +08:00
parent 872f197c55 b746443883
commit f6b516bd86
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rk3188/Makefile
View File

@@ -16,7 +16,7 @@ obj-$(CONFIG_SMP) += ../mach-rk30/platsmp.o ../mach-rk30/headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += ../mach-rk30/hotplug.o
obj-$(CONFIG_CPU_IDLE) += ../mach-rk30/cpuidle.o
obj-$(CONFIG_CPU_FREQ) += ../mach-rk30/cpufreq.o
obj-$(CONFIG_DVFS) += ../mach-rk30/dvfs.o
obj-$(CONFIG_DVFS) += dvfs.o
obj-$(CONFIG_MACH_RK3188_FPGA) += board-rk3188-fpga.o
obj-$(CONFIG_MACH_RK3188_TB) += ../mach-rk30/board-rk3168-tb.o

4
arch/arm/mach-rk3188/clock_data.c
View File

@@ -3180,12 +3180,12 @@ void __init _rk30_clock_data_init(unsigned long gpll, unsigned long cpll, int fl
//cru_writel(0x07000000,CRU_MISC_CON);
}
extern int rk30_dvfs_init(void);
extern int rk3188_dvfs_init(void);
void __init rk30_clock_data_init(unsigned long gpll, unsigned long cpll, u32 flags)
{
_rk30_clock_data_init(gpll, cpll, flags);
rk30_dvfs_init();
rk3188_dvfs_init();
}
/*