From 4e3ef21e5769db7a0e5de3e5618156a4e3985a2f Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Fri, 27 Jan 2012 16:16:19 +0900 Subject: [PATCH] --- yaml --- r: 295681 b: refs/heads/master c: 4083da3dcd1901394036e81f858abb2257c7c772 h: refs/heads/master i: 295679: 81aa1775b53af68c6cade1442bd8a791c624d3d2 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2416/clock.c | 1 - trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c | 1 - .../arm/plat-samsung/include/plat/clock.h | 17 +++++++++++++++++ .../arm/plat-samsung/include/plat/s3c2443.h | 19 ------------------- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/[refs] b/[refs] index 71edaa0b5753..3d843ac1a2cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37892ff4e4760c675127827e48019438bb33da08 +refs/heads/master: 4083da3dcd1901394036e81f858abb2257c7c772 diff --git a/trunk/arch/arm/mach-s3c2416/clock.c b/trunk/arch/arm/mach-s3c2416/clock.c index 59f54d1d7f8b..5e36905eb7fc 100644 --- a/trunk/arch/arm/mach-s3c2416/clock.c +++ b/trunk/arch/arm/mach-s3c2416/clock.c @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c b/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c index 95e68190d593..363306061c89 100644 --- a/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c +++ b/trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c @@ -12,7 +12,6 @@ #include -#include #include #include #include diff --git a/trunk/arch/arm/plat-samsung/include/plat/clock.h b/trunk/arch/arm/plat-samsung/include/plat/clock.h index 73c66d4d10fa..42bbe3d99539 100644 --- a/trunk/arch/arm/plat-samsung/include/plat/clock.h +++ b/trunk/arch/arm/plat-samsung/include/plat/clock.h @@ -79,6 +79,10 @@ extern struct clk clk_epll; extern struct clk clk_xtal; extern struct clk clk_ext; +/* S3C2443/S3C2416 specific clocks */ +extern struct clksrc_clk clk_epllref; +extern struct clksrc_clk clk_esysclk; + /* S3C64XX specific clocks */ extern struct clk clk_h2; extern struct clk clk_27m; @@ -116,6 +120,19 @@ extern void s3c2412_setup_clocks(void); extern void s3c244x_setup_clocks(void); extern void s3c2443_setup_clocks(void); +/* S3C2443/S3C2416 specific clock functions */ + +typedef unsigned int (*pll_fn)(unsigned int reg, unsigned int base); + +extern void s3c2443_common_setup_clocks(pll_fn get_mpll); +extern void s3c2443_common_init_clocks(int xtal, pll_fn get_mpll, + unsigned int *divs, int nr_divs, + int divmask); + +extern int s3c2443_clkcon_enable_h(struct clk *clk, int enable); +extern int s3c2443_clkcon_enable_p(struct clk *clk, int enable); +extern int s3c2443_clkcon_enable_s(struct clk *clk, int enable); + /* S3C64XX specific functions and clocks */ extern int s3c64xx_sclk_ctrl(struct clk *clk, int enable); diff --git a/trunk/arch/arm/plat-samsung/include/plat/s3c2443.h b/trunk/arch/arm/plat-samsung/include/plat/s3c2443.h index ffaecb9049c0..a5b794ff838b 100644 --- a/trunk/arch/arm/plat-samsung/include/plat/s3c2443.h +++ b/trunk/arch/arm/plat-samsung/include/plat/s3c2443.h @@ -32,22 +32,3 @@ extern void s3c2443_restart(char mode, const char *cmd); #define s3c2443_init NULL #define s3c2443_restart NULL #endif - -/* common code used by s3c2443 and others. - * note, not to be used outside of arch/arm/mach-s3c* */ - -struct clk; /* some files don't need clk.h otherwise */ - -typedef unsigned int (*pll_fn)(unsigned int reg, unsigned int base); - -extern void s3c2443_common_setup_clocks(pll_fn get_mpll); -extern void s3c2443_common_init_clocks(int xtal, pll_fn get_mpll, - unsigned int *divs, int nr_divs, - int divmask); - -extern int s3c2443_clkcon_enable_h(struct clk *clk, int enable); -extern int s3c2443_clkcon_enable_p(struct clk *clk, int enable); -extern int s3c2443_clkcon_enable_s(struct clk *clk, int enable); - -extern struct clksrc_clk clk_epllref; -extern struct clksrc_clk clk_esysclk;