Skip to content

Commit

Permalink
[ARM] pxa: allow PWM ID base number to be specified in pwm_id_table
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Miao authored and Eric Miao committed Jun 5, 2009
1 parent 3d2a98c commit a757ad8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/arm/mach-pxa/pwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a757ad8

Please sign in to comment.