S3C24XX: remove plat-s3c24xx/clock.c
From: Heiko Stuebner <heiko@...> Date: Wed, 11 Jan 2012 21:55:38 +0100
Commit-Message
With its users reduced, the clock.c does not need to stay around. s3c24xx_setup_clocks can move into s3c2410-clocks.c for 2410 and 244x, and its functionality also into s3c2412.c Signed-off-by: Heiko Stuebner <heiko@...>
Patch-Comment
arch/arm/mach-s3c2412/clock.c | 1 + arch/arm/mach-s3c2412/s3c2412.c | 7 +++- arch/arm/plat-s3c24xx/Makefile | 1 - arch/arm/plat-s3c24xx/clock.c | 59 --------------------------------- arch/arm/plat-s3c24xx/s3c2410-clock.c | 15 ++++++++ 5 files changed, 22 insertions(+), 61 deletions(-) delete mode 100644 arch/arm/plat-s3c24xx/clock.c
Statistics
- 22 lines added
- 61 lines removed
Changes
------------------------ arch/arm/mach-s3c2412/clock.c -------------------------
index d10b695..3a1312b 100644
@@ -44,6 +44,7 @@
#include <plat/s3c2412.h>
#include <plat/clock.h>
#include <plat/cpu.h>
+#include <plat/pll.h>
/* We currently have to assume that the system is running
* from the XTPll input, and that all ***REFCLKs are being
----------------------- arch/arm/mach-s3c2412/s3c2412.c ------------------------
index c6eac98..224d4cd 100644
@@ -202,7 +202,12 @@ void __init_or_cpufreq s3c2412_setup_clocks(void)
printk("S3C2412: core %ld.%03ld MHz, memory %ld.%03ld MHz, peripheral %ld.%03ld MHz\n",
print_mhz(fclk), print_mhz(hclk), print_mhz(pclk));
+ clk_upll.rate = s3c24xx_get_pll(__raw_readl(S3C2410_UPLLCON),
+ clk_xtal.rate);
+
+ clk_h.rate = hclk;
+ clk_p.rate = pclk;
+ clk_f.rate = fclk;
}
void __init s3c2412_init_clocks(int xtal)
------------------------ arch/arm/plat-s3c24xx/Makefile ------------------------
index b2b0112..0be2263 100644
@@ -15,7 +15,6 @@ obj- :=
obj-y += cpu.o
obj-y += irq.o
obj-y += dev-uart.o
obj-$(CONFIG_S3C24XX_DCLK) += clock-dclk.o
obj-$(CONFIG_CPU_FREQ_S3C24XX) += cpu-freq.o
------------------------ arch/arm/plat-s3c24xx/clock.c -------------------------
deleted file mode 100644
index 931d26d..0000000
@@ -1,59 +0,0 @@
-------------------- arch/arm/plat-s3c24xx/s3c2410-clock.c ---------------------
index 25dc4d4..76edfb8 100644
@@ -44,6 +44,8 @@
#include <plat/s3c2410.h>
#include <plat/clock.h>
#include <plat/cpu.h>
+#include <plat/pll.h>
+#include <plat/cpu-freq.h>
int s3c2410_clkcon_enable(struct clk *clk, int enable)
{
@@ -251,3 +253,16 @@ int __init s3c2410_baseclk_add(void)
s3c_pwmclk_init();
return 0;
}
+
+void __init_or_cpufreq s3c24xx_setup_clocks(unsigned long fclk,
+ unsigned long hclk,
+ unsigned long pclk)
+{
+ clk_upll.rate = s3c24xx_get_pll(__raw_readl(S3C2410_UPLLCON),
+ clk_xtal.rate);
+
+ clk_mpll.rate = fclk;
+ clk_h.rate = hclk;
+ clk_p.rate = pclk;
+ clk_f.rate = fclk;
+}