]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] 5136/1: pxa: fix PWM device order for pxa27x
authorPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 30 Jun 2008 17:09:03 +0000 (18:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Jul 2008 12:24:22 +0000 (13:24 +0100)
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>
arch/arm/mach-pxa/pwm.c

index 70fb3ca6a058045bea6da5592107300f83c6a301..fa9323ee854c7d779d8282cf96c0d8dac0e7656a 100644 (file)
@@ -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);