---

yaml --- r: 149328 b: refs/heads/master c: a757ad8 h: refs/heads/master v: v3
git-mirror · Jun 5, 2009 · c9a16b2 · c9a16b2
1 parent 2a3b2f7
commit c9a16b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d2a98cd5e17052f461390c72efe1076c18fd62d
+refs/heads/master: a757ad8b391adb2129f8357545aaa678099df473
diff --git a/trunk/arch/arm/mach-pxa/pwm.c b/trunk/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);