aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa25x.c
diff options
context:
space:
mode:
authoreric miao <eric.miao@marvell.com>2008-04-13 16:44:04 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-05-19 11:25:39 -0400
commit75540c1ac3c7bd72ac8e092058f9714875239995 (patch)
tree9d6dc7cb389f879be36a1583ce8949023a55dd2d /arch/arm/mach-pxa/pxa25x.c
parent1a189b97190d3f0f8cf0379a799d3555b2d648bb (diff)
[ARM] pxa: Add PXA support for PWM API
Patch mainly from Eric Miao, with minor edits by rmk. Note: PWM0 and PWM2 share the same register I/O space and clock gating on pxa{27x, 3xx}, thus PWM2 is treated in the driver as a child PWM of PWM0. And this is also true for PWM1/3. Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
-rw-r--r--arch/arm/mach-pxa/pxa25x.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index e5b417d14bb0..2bed3f98d41c 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -129,12 +129,12 @@ static struct clk pxa25x_clks[] = {
129 INIT_CKEN("SSPCLK", SSP, 3686400, 0, &pxa25x_device_ssp.dev), 129 INIT_CKEN("SSPCLK", SSP, 3686400, 0, &pxa25x_device_ssp.dev),
130 INIT_CKEN("SSPCLK", NSSP, 3686400, 0, &pxa25x_device_nssp.dev), 130 INIT_CKEN("SSPCLK", NSSP, 3686400, 0, &pxa25x_device_nssp.dev),
131 INIT_CKEN("SSPCLK", ASSP, 3686400, 0, &pxa25x_device_assp.dev), 131 INIT_CKEN("SSPCLK", ASSP, 3686400, 0, &pxa25x_device_assp.dev),
132 INIT_CKEN("PWMCLK", PWM0, 3686400, 0, &pxa25x_device_pwm0.dev),
133 INIT_CKEN("PWMCLK", PWM1, 3686400, 0, &pxa25x_device_pwm1.dev),
132 134
133 INIT_CKEN("AC97CLK", AC97, 24576000, 0, NULL), 135 INIT_CKEN("AC97CLK", AC97, 24576000, 0, NULL),
134 136
135 /* 137 /*
136 INIT_CKEN("PWMCLK", PWM0, 3686400, 0, NULL),
137 INIT_CKEN("PWMCLK", PWM0, 3686400, 0, NULL),
138 INIT_CKEN("I2SCLK", I2S, 14745600, 0, NULL), 138 INIT_CKEN("I2SCLK", I2S, 14745600, 0, NULL),
139 */ 139 */
140 INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), 140 INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL),
@@ -269,6 +269,8 @@ static struct platform_device *pxa25x_devices[] __initdata = {
269 &pxa25x_device_ssp, 269 &pxa25x_device_ssp,
270 &pxa25x_device_nssp, 270 &pxa25x_device_nssp,
271 &pxa25x_device_assp, 271 &pxa25x_device_assp,
272 &pxa25x_device_pwm0,
273 &pxa25x_device_pwm1,
272}; 274};
273 275
274static struct sys_device pxa25x_sysdev[] = { 276static struct sys_device pxa25x_sysdev[] = {