aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2008-06-30 13:09:03 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-03 08:24:22 -0400
commit0b1c25d2c0f35b4cdd3f04f365cff31fc5a21813 (patch)
tree3a80093a828c5714f63f2dfa96bb42b98dd0301e /arch/arm
parent75540c1ac3c7bd72ac8e092058f9714875239995 (diff)
[ARM] 5136/1: pxa: fix PWM device order for pxa27x
Currently PWM0/2 (pxa27x_device_pwm0 at 0x40b00000 and 0x40b00010 are registered as as pwm_id 0 and 1, PWM1/3 (pxa27x_device_pwm1 at 0x40c00000 and 0x40c00010) are registered as pwm_id 2 and 3. This patch corrects the pwm_ids to match the documented register names. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/pwm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pwm.c b/arch/arm/mach-pxa/pwm.c
index 70fb3ca6a058..fa9323ee854c 100644
--- a/arch/arm/mach-pxa/pwm.c
+++ b/arch/arm/mach-pxa/pwm.c
@@ -221,11 +221,11 @@ static int __devinit pxa27x_pwm_probe(struct platform_device *pdev)
221{ 221{
222 struct pwm_device *pwm; 222 struct pwm_device *pwm;
223 223
224 pwm = pwm_probe(pdev, pdev->id * 2, NULL); 224 pwm = pwm_probe(pdev, pdev->id, NULL);
225 if (IS_ERR(pwm)) 225 if (IS_ERR(pwm))
226 return PTR_ERR(pwm); 226 return PTR_ERR(pwm);
227 227
228 pwm = pwm_probe(pdev, pdev->id * 2 + 1, pwm); 228 pwm = pwm_probe(pdev, pdev->id + 2, pwm);
229 if (IS_ERR(pwm)) 229 if (IS_ERR(pwm))
230 return PTR_ERR(pwm); 230 return PTR_ERR(pwm);
231 231