From 2e8581e756ddbd0dea8b0d4059e9a82d2929de01 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Mon, 22 Nov 2010 09:41:39 +0800 Subject: ARM: pxa: replace duplicated macro DEFINE_PXA3_CK() with DEFINE_CK() Signed-off-by: Eric Miao --- arch/arm/mach-pxa/clock.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'arch/arm/mach-pxa/clock.h') diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index d848874..f09ecb1 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h @@ -21,14 +21,6 @@ struct clk { .con_id = _conname, \ } -#define DEFINE_CKEN(_name, _cken, _rate, _delay) \ -struct clk clk_##_name = { \ - .ops = &clk_cken_ops, \ - .rate = _rate, \ - .cken = CKEN_##_cken, \ - .delay = _delay, \ - } - #define DEFINE_CK(_name, _cken, _ops) \ struct clk clk_##_name = { \ .ops = _ops, \ @@ -42,6 +34,14 @@ struct clk clk_##_name = { \ .delay = _delay, \ } +#define DEFINE_CKEN(_name, _cken, _rate, _delay) \ +struct clk clk_##_name = { \ + .ops = &clk_cken_ops, \ + .rate = _rate, \ + .cken = CKEN_##_cken, \ + .delay = _delay, \ + } + extern const struct clkops clk_cken_ops; void clk_cken_enable(struct clk *clk); @@ -56,12 +56,6 @@ struct clk clk_##_name = { \ .delay = _delay, \ } -#define DEFINE_PXA3_CK(_name, _cken, _ops) \ -struct clk clk_##_name = { \ - .ops = _ops, \ - .cken = CKEN_##_cken, \ - } - extern const struct clkops clk_pxa3xx_cken_ops; extern void clk_pxa3xx_cken_enable(struct clk *); extern void clk_pxa3xx_cken_disable(struct clk *); -- cgit v1.1 From 4029813c89926ae5d78cc2dff49d845d934424f6 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Mon, 22 Nov 2010 10:49:55 +0800 Subject: ARM: pxa: separate the clock support into clock-{pxa2xx,pxa3xx}.c Signed-off-by: Eric Miao --- arch/arm/mach-pxa/clock.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'arch/arm/mach-pxa/clock.h') diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index f09ecb1..0434878 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h @@ -14,6 +14,12 @@ struct clk { unsigned int enabled; }; +void clk_dummy_enable(struct clk *); +void clk_dummy_disable(struct clk *); + +extern const struct clkops clk_dummy_ops; +extern struct clk clk_dummy; + #define INIT_CLKREG(_clk,_devname,_conname) \ { \ .clk = _clk, \ @@ -34,18 +40,18 @@ struct clk clk_##_name = { \ .delay = _delay, \ } -#define DEFINE_CKEN(_name, _cken, _rate, _delay) \ +#define DEFINE_PXA2_CKEN(_name, _cken, _rate, _delay) \ struct clk clk_##_name = { \ - .ops = &clk_cken_ops, \ + .ops = &clk_pxa2xx_cken_ops, \ .rate = _rate, \ .cken = CKEN_##_cken, \ .delay = _delay, \ } -extern const struct clkops clk_cken_ops; +extern const struct clkops clk_pxa2xx_cken_ops; -void clk_cken_enable(struct clk *clk); -void clk_cken_disable(struct clk *clk); +void clk_pxa2xx_cken_enable(struct clk *clk); +void clk_pxa2xx_cken_disable(struct clk *clk); #ifdef CONFIG_PXA3xx #define DEFINE_PXA3_CKEN(_name, _cken, _rate, _delay) \ @@ -57,7 +63,10 @@ struct clk clk_##_name = { \ } extern const struct clkops clk_pxa3xx_cken_ops; +extern const struct clkops clk_pxa3xx_hsio_ops; +extern const struct clkops clk_pxa3xx_ac97_ops; +extern const struct clkops clk_pxa3xx_pout_ops; + extern void clk_pxa3xx_cken_enable(struct clk *); extern void clk_pxa3xx_cken_disable(struct clk *); #endif - -- cgit v1.1 From f113fe4e844be15394edcbc32b0ec196cdd0a0ff Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Tue, 23 Nov 2010 17:00:03 +0800 Subject: ARM: pxa: introduce pxa2xx_clock_sysclass for clock suspend/resume Signed-off-by: Eric Miao --- arch/arm/mach-pxa/clock.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-pxa/clock.h') diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index 0434878..8ffc1d0 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h @@ -1,3 +1,4 @@ +#include #include struct clkops { @@ -53,6 +54,8 @@ extern const struct clkops clk_pxa2xx_cken_ops; void clk_pxa2xx_cken_enable(struct clk *clk); void clk_pxa2xx_cken_disable(struct clk *clk); +extern struct sysdev_class pxa2xx_clock_sysclass; + #ifdef CONFIG_PXA3xx #define DEFINE_PXA3_CKEN(_name, _cken, _rate, _delay) \ struct clk clk_##_name = { \ -- cgit v1.1 From aae8224ddd72e045bb92eaf6b73b89282c771c69 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Tue, 23 Nov 2010 17:07:48 +0800 Subject: ARM: pxa: introduce pxa3xx_clock_sysclass for clock suspend/resume Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao --- arch/arm/mach-pxa/clock.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-pxa/clock.h') diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index 8ffc1d0..cf2cbd0 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h @@ -72,4 +72,6 @@ extern const struct clkops clk_pxa3xx_pout_ops; extern void clk_pxa3xx_cken_enable(struct clk *); extern void clk_pxa3xx_cken_disable(struct clk *); + +extern struct sysdev_class pxa3xx_clock_sysclass; #endif -- cgit v1.1 From a4553358d94b4a1f3e6f24aacfd076022ac14855 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Wed, 24 Nov 2010 11:54:19 +0800 Subject: ARM: pxa: support pxa95x The core of PXA955 is PJ4. Add new PJ4 support. And add new macro CONFIG_PXA95x. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao --- arch/arm/mach-pxa/clock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-pxa/clock.h') diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index cf2cbd0..3a60752 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h @@ -56,7 +56,7 @@ void clk_pxa2xx_cken_disable(struct clk *clk); extern struct sysdev_class pxa2xx_clock_sysclass; -#ifdef CONFIG_PXA3xx +#if defined(CONFIG_PXA3xx) || defined(CONFIG_PXA95x) #define DEFINE_PXA3_CKEN(_name, _cken, _rate, _delay) \ struct clk clk_##_name = { \ .ops = &clk_pxa3xx_cken_ops, \ -- cgit v1.1 From c085052bc52d7caaca1172aabbedc06777253961 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Mon, 29 Nov 2010 22:56:00 +0800 Subject: ARM: pxa: add clock for static memory controller Signed-off-by: Eric Miao --- arch/arm/mach-pxa/clock.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-pxa/clock.h') diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index 3a60752..6e94994 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h @@ -69,6 +69,7 @@ extern const struct clkops clk_pxa3xx_cken_ops; extern const struct clkops clk_pxa3xx_hsio_ops; extern const struct clkops clk_pxa3xx_ac97_ops; extern const struct clkops clk_pxa3xx_pout_ops; +extern const struct clkops clk_pxa3xx_smemc_ops; extern void clk_pxa3xx_cken_enable(struct clk *); extern void clk_pxa3xx_cken_disable(struct clk *); -- cgit v1.1