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

Commit 4659c534 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: add platform code for conversion to the common clock framework 



This adds the necessary init functions to init the clocks from the common
clock framework and necessary CONFIG_SAMSUNG_CLOCK ifdefs around the legacy
clock code.

This also includes empty stubs for the *_setup_clocks functions that are
called from the cpufreq driver on resume.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 3f7c01ad

arch/arm/mach-s3c24xx/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ config PLAT_S3C24XX 
	help

	  Base platform code for any Samsung S3C24XX device



config S3C2410_COMMON_CLK

	bool

	help

	  Build the s3c2410 clock driver based on the common clock framework.



config S3C2410_COMMON_DCLK

	bool

	select REGMAP_MMIO

arch/arm/mach-s3c24xx/common.c

+25 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <plat/cpu-freq.h>

#include <plat/pll.h>

#include <plat/pwm-core.h>

#include <plat/watchdog-reset.h>



#include "common.h"
@@ -533,6 +534,14 @@ struct platform_device s3c2443_device_dma = { 
};

#endif



#if defined(CONFIG_COMMON_CLK) && defined(CONFIG_CPU_S3C2410)

void __init s3c2410_init_clocks(int xtal)

{

	s3c2410_common_clk_init(NULL, xtal, 0, S3C24XX_VA_CLKPWR);

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#endif



#ifdef CONFIG_CPU_S3C2412

void __init s3c2412_init_clocks(int xtal)

{
@@ -547,6 +556,22 @@ void __init s3c2416_init_clocks(int xtal) 
}

#endif



#if defined(CONFIG_COMMON_CLK) && defined(CONFIG_CPU_S3C2440)

void __init s3c2440_init_clocks(int xtal)

{

	s3c2410_common_clk_init(NULL, xtal, 1, S3C24XX_VA_CLKPWR);

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#endif



#if defined(CONFIG_COMMON_CLK) && defined(CONFIG_CPU_S3C2442)

void __init s3c2442_init_clocks(int xtal)

{

	s3c2410_common_clk_init(NULL, xtal, 2, S3C24XX_VA_CLKPWR);

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#endif



#ifdef CONFIG_CPU_S3C2443

void __init s3c2443_init_clocks(int xtal)

{

arch/arm/mach-s3c24xx/common.h

+7 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ extern void s3c244x_restart(enum reboot_mode mode, const char *cmd); 
#ifdef CONFIG_CPU_S3C2440

extern  int s3c2440_init(void);

extern void s3c2440_map_io(void);

extern void s3c2440_init_clocks(int xtal);

extern void s3c2440_init_irq(void);

#else

#define s3c2440_init NULL
@@ -86,6 +87,7 @@ extern void s3c2440_init_irq(void); 
#ifdef CONFIG_CPU_S3C2442

extern  int s3c2442_init(void);

extern void s3c2442_map_io(void);

extern void s3c2442_init_clocks(int xtal);

extern void s3c2442_init_irq(void);

#else

#define s3c2442_init NULL
@@ -116,6 +118,11 @@ extern struct platform_device s3c2443_device_dma; 


extern struct platform_device s3c2410_device_dclk;



#ifdef CONFIG_S3C2410_COMMON_CLK

void __init s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f,

				    int current_soc,

				    void __iomem *reg_base);

#endif

#ifdef CONFIG_S3C2412_COMMON_CLK

void __init s3c2412_common_clk_init(struct device_node *np, unsigned long xti_f,

				unsigned long ext_f, void __iomem *reg_base);

arch/arm/mach-s3c24xx/s3c2410.c

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ void __init s3c2410_map_io(void) 
	iotable_init(s3c2410_iodesc, ARRAY_SIZE(s3c2410_iodesc));

}



#ifdef CONFIG_SAMSUNG_CLOCK

void __init_or_cpufreq s3c2410_setup_clocks(void)

{

	struct clk *xtal_clk;
@@ -142,6 +143,11 @@ void __init s3c2410_init_clocks(int xtal) 
	clkdev_add_table(s3c2410_clk_lookup, ARRAY_SIZE(s3c2410_clk_lookup));

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#else

void __init_or_cpufreq s3c2410_setup_clocks(void)

{

}

#endif



struct bus_type s3c2410_subsys = {

	.name = "s3c2410-core",

arch/arm/mach-s3c24xx/s3c2442.c

+2 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 


#include "common.h"



#ifdef CONFIG_SAMSUNG_CLOCK

/* S3C2442 extended clock support */



static unsigned long s3c2442_camif_upll_round(struct clk *clk,
@@ -162,7 +163,7 @@ static __init int s3c2442_clk_init(void) 
}



arch_initcall(s3c2442_clk_init);



#endif



static struct device s3c2442_dev = {

	.bus		= &s3c2442_subsys,