p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mfd: stmpe: Add the proper PWM resources 

This adds the PWM resources to the STMPE MFD driver, so that
it can properly grab and use them.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Linus Walleij 2016-02-14 14:07:07 +01:00 committed by Lee Jones
parent 5c1488906f
commit b273c5e0b6
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/mfd/stmpe.c
View File

@ -333,6 +333,31 @@ static const struct mfd_cell stmpe_keypad_cell = {
.num_resources = ARRAY_SIZE(stmpe_keypad_resources), .num_resources = ARRAY_SIZE(stmpe_keypad_resources),
}; };
/*
* PWM (1601, 2401, 2403)
*/
static struct resource stmpe_pwm_resources[] = {
{
.name = "PWM0",
.flags = IORESOURCE_IRQ,
},
{
.name = "PWM1",
.flags = IORESOURCE_IRQ,
},
{
.name = "PWM2",
.flags = IORESOURCE_IRQ,
},
};
static const struct mfd_cell stmpe_pwm_cell = {
.name = "stmpe-pwm",
.of_compatible = "st,stmpe-pwm",
.resources = stmpe_pwm_resources,
.num_resources = ARRAY_SIZE(stmpe_pwm_resources),
};
/* /*
* STMPE801 * STMPE801
*/ */
@ -537,6 +562,11 @@ static struct stmpe_variant_block stmpe1601_blocks[] = {
.irq = STMPE1601_IRQ_KEYPAD, .irq = STMPE1601_IRQ_KEYPAD,
.block = STMPE_BLOCK_KEYPAD, .block = STMPE_BLOCK_KEYPAD,
}, },
{
.cell = &stmpe_pwm_cell,
.irq = STMPE1601_IRQ_PWM0,
.block = STMPE_BLOCK_PWM,
},
}; };
/* supported autosleep timeout delay (in msecs) */ /* supported autosleep timeout delay (in msecs) */
@ -771,6 +801,11 @@ static struct stmpe_variant_block stmpe24xx_blocks[] = {
.irq = STMPE24XX_IRQ_KEYPAD, .irq = STMPE24XX_IRQ_KEYPAD,
.block = STMPE_BLOCK_KEYPAD, .block = STMPE_BLOCK_KEYPAD,
}, },
{
.cell = &stmpe_pwm_cell,
.irq = STMPE24XX_IRQ_PWM0,
.block = STMPE_BLOCK_PWM,
},
}; };
static int stmpe24xx_enable(struct stmpe *stmpe, unsigned int blocks, static int stmpe24xx_enable(struct stmpe *stmpe, unsigned int blocks,