Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4083da3d authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: move common S3C2443 clock definitions to clock.h 



plat-samsung/clock.h currently keeps all the SoC specific clock
declarations except the ones for S3C2443/S3C2416 which were kept in
s3c2443.h.

This patch moves them out of s3c2443.h to get rid of the header
completely later on.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 37892ff4

arch/arm/mach-s3c2416/clock.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/clk.h>



#include <plat/s3c2416.h>

#include <plat/s3c2443.h>

#include <plat/clock.h>

#include <plat/clock-clksrc.h>

#include <plat/cpu.h>

arch/arm/plat-s3c24xx/s3c2443-clock.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


#include <mach/regs-s3c2443-clock.h>



#include <plat/s3c2443.h>

#include <plat/clock.h>

#include <plat/clock-clksrc.h>

#include <plat/cpu.h>

arch/arm/plat-samsung/include/plat/clock.h

+17 −0
Original line number Diff line number Diff line
@@ -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);

arch/arm/plat-samsung/include/plat/s3c2443.h

+0 −19
Original line number Diff line number Diff line
@@ -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;