From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752329AbcBOIam (ORCPT ); Mon, 15 Feb 2016 03:30:42 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:36063 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751815AbcBOIak (ORCPT ); Mon, 15 Feb 2016 03:30:40 -0500 Date: Mon, 15 Feb 2016 08:30:35 +0000 From: Lee Jones To: Linus Walleij Cc: Samuel Ortiz , linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, Thierry Reding Subject: Re: [PATCH] mfd: stmpe: add the proper PWM resources Message-ID: <20160215083035.GC3455@x1> References: <1455455227-16848-1-git-send-email-linus.walleij@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1455455227-16848-1-git-send-email-linus.walleij@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 14 Feb 2016, Linus Walleij wrote: > This adds the PWM resources to the STMPE MFD driver, so that > it can properly grab and use them. > > Cc: linux-pwm@vger.kernel.org > Cc: Thierry Reding > Signed-off-by: Linus Walleij > --- > ChangeLog: split this patch off from the PWM driver and sent > separately. This can be merged separately too so we need no > criss-cross between MFD and PWM anymore, Lee: this one is for > you if it looks all right, excess newlines are gone too. > --- > drivers/mfd/stmpe.c | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) Applied, thanks. > diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c > index 8222e374e4b1..fb8f9e8b75df 100644 > --- a/drivers/mfd/stmpe.c > +++ b/drivers/mfd/stmpe.c > @@ -334,6 +334,31 @@ static const struct mfd_cell stmpe_keypad_cell = { > }; > > /* > + * 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 > */ > static const u8 stmpe801_regs[] = { > @@ -537,6 +562,11 @@ static struct stmpe_variant_block stmpe1601_blocks[] = { > .irq = STMPE1601_IRQ_KEYPAD, > .block = STMPE_BLOCK_KEYPAD, > }, > + { > + .cell = &stmpe_pwm_cell, > + .irq = STMPE1601_IRQ_PWM0, > + .block = STMPE_BLOCK_PWM, > + }, > }; > > /* supported autosleep timeout delay (in msecs) */ > @@ -771,6 +801,11 @@ static struct stmpe_variant_block stmpe24xx_blocks[] = { > .irq = STMPE24XX_IRQ_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, -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog