diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2008-06-30 18:09:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-03 13:24:22 +0100 |
| commit | 0b1c25d2c0f35b4cdd3f04f365cff31fc5a21813 (patch) | |
| tree | 3a80093a828c5714f63f2dfa96bb42b98dd0301e /arch | |
| parent | 75540c1ac3c7bd72ac8e092058f9714875239995 (diff) | |
| download | linux-stable-0b1c25d2c0f35b4cdd3f04f365cff31fc5a21813.tar.gz linux-stable-0b1c25d2c0f35b4cdd3f04f365cff31fc5a21813.tar.bz2 linux-stable-0b1c25d2c0f35b4cdd3f04f365cff31fc5a21813.zip | |
[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')
| -rw-r--r-- | arch/arm/mach-pxa/pwm.c | 4 |
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) { struct pwm_device *pwm; - pwm = pwm_probe(pdev, pdev->id * 2, NULL); + pwm = pwm_probe(pdev, pdev->id, NULL); if (IS_ERR(pwm)) return PTR_ERR(pwm); - pwm = pwm_probe(pdev, pdev->id * 2 + 1, pwm); + pwm = pwm_probe(pdev, pdev->id + 2, pwm); if (IS_ERR(pwm)) return PTR_ERR(pwm); |