summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-04-13 18:51:31 +0800
committerEric Miao <eric.y.miao@gmail.com>2009-06-05 10:32:03 +0800
commita757ad8b391adb2129f8357545aaa678099df473 (patch)
tree42bf36574d6bf3d29cffa3d74e3b203422a01346 /arch
parent3d2a98cd5e17052f461390c72efe1076c18fd62d (diff)
downloadlinux-stable-a757ad8b391adb2129f8357545aaa678099df473.tar.gz
linux-stable-a757ad8b391adb2129f8357545aaa678099df473.tar.bz2
linux-stable-a757ad8b391adb2129f8357545aaa678099df473.zip
[ARM] pxa: allow PWM ID base number to be specified in pwm_id_table
PWMs on PXA168/910 start at number 1 instead of 0, (i.e. PWM1/2/3/4 instead of PWM0/1/2/3 on PXA25x/PXA27x/PXA3xx). Allow this number to be specified in pwm_id_table. Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/pwm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pwm.c b/arch/arm/mach-pxa/pwm.c
index dec6f2c8dbf9..5513c51ff984 100644
--- a/arch/arm/mach-pxa/pwm.c
+++ b/arch/arm/mach-pxa/pwm.c
@@ -22,11 +22,12 @@
#include <asm/div64.h>
#define HAS_SECONDARY_PWM 0x10
+#define PWM_ID_BASE(d) ((d) & 0xf)
static const struct platform_device_id pwm_id_table[] = {
/* PWM has_secondary_pwm? */
{ "pxa25x-pwm", 0 },
- { "pxa27x-pwm", HAS_SECONDARY_PWM },
+ { "pxa27x-pwm", 0 | HAS_SECONDARY_PWM },
{ },
};
MODULE_DEVICE_TABLE(platform, pwm_id_table);
@@ -191,7 +192,7 @@ static int __devinit pwm_probe(struct platform_device *pdev)
pwm->clk_enabled = 0;
pwm->use_count = 0;
- pwm->pwm_id = pdev->id;
+ pwm->pwm_id = PWM_ID_BASE(id->driver_data) + pdev->id;
pwm->pdev = pdev;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);