From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: Re: [PATCH v4 5/5] pwm-pca9685: enable ACPI device found on Galileo Gen2 Date: Mon, 09 Nov 2015 15:53:36 +0200 Message-ID: <1447077216.31665.73.camel@linux.intel.com> References: <1445591805-28886-1-git-send-email-andriy.shevchenko@linux.intel.com> <1445591805-28886-6-git-send-email-andriy.shevchenko@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mga11.intel.com ([192.55.52.93]:16618 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751213AbbKINxg (ORCPT ); Mon, 9 Nov 2015 08:53:36 -0500 In-Reply-To: <1445591805-28886-6-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: linux-acpi@vger.kernel.org, linux-i2c@vger.kernel.org, Lee Jones , Wolfram Sang , "Rafael J . Wysocki" , Mika Westerberg , "Puustinen, Ismo" , linux-kernel@vger.kernel.org Cc: Thierry Reding On Fri, 2015-10-23 at 12:16 +0300, Andy Shevchenko wrote: > There is a chip connected to i2c bus on Intel Galileo Gen2 board. > Enable it via > ACPI ID INT3492. Thierry, ping? >=20 > Cc: Thierry Reding > Signed-off-by: Andy Shevchenko > --- > =C2=A0drivers/pwm/Kconfig=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2= =A0=C2=A02 +- > =C2=A0drivers/pwm/pwm-pca9685.c | 20 ++++++++++++++++---- > =C2=A02 files changed, 17 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index 062630a..bb114ef 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -242,7 +242,7 @@ config PWM_MXS > =C2=A0 > =C2=A0config PWM_PCA9685 > =C2=A0 tristate "NXP PCA9685 PWM driver" > - depends on OF && I2C > + depends on I2C > =C2=A0 select REGMAP_I2C > =C2=A0 help > =C2=A0 =C2=A0=C2=A0Generic PWM framework driver for NXP PCA9685 LED > controller. > diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c > index 70448a6..117fccf 100644 > --- a/drivers/pwm/pwm-pca9685.c > +++ b/drivers/pwm/pwm-pca9685.c > @@ -19,9 +19,11 @@ > =C2=A0 * this program.=C2=A0=C2=A0If not, see . > =C2=A0 */ > =C2=A0 > +#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > +#include > =C2=A0#include > =C2=A0#include > =C2=A0#include > @@ -297,7 +299,6 @@ static const struct regmap_config > pca9685_regmap_i2c_config =3D { > =C2=A0static int pca9685_pwm_probe(struct i2c_client *client, > =C2=A0 const struct i2c_device_id *id) > =C2=A0{ > - struct device_node *np =3D client->dev.of_node; > =C2=A0 struct pca9685 *pca; > =C2=A0 int ret; > =C2=A0 int mode2; > @@ -320,12 +321,12 @@ static int pca9685_pwm_probe(struct i2c_client > *client, > =C2=A0 > =C2=A0 regmap_read(pca->regmap, PCA9685_MODE2, &mode2); > =C2=A0 > - if (of_property_read_bool(np, "invert")) > + if (device_property_read_bool(&client->dev, "invert")) > =C2=A0 mode2 |=3D MODE2_INVRT; > =C2=A0 else > =C2=A0 mode2 &=3D ~MODE2_INVRT; > =C2=A0 > - if (of_property_read_bool(np, "open-drain")) > + if (device_property_read_bool(&client->dev, "open-drain")) > =C2=A0 mode2 &=3D ~MODE2_OUTDRV; > =C2=A0 else > =C2=A0 mode2 |=3D MODE2_OUTDRV; > @@ -363,16 +364,27 @@ static const struct i2c_device_id pca9685_id[] > =3D { > =C2=A0}; > =C2=A0MODULE_DEVICE_TABLE(i2c, pca9685_id); > =C2=A0 > +#ifdef CONFIG_ACPI > +static const struct acpi_device_id pca9685_acpi_ids[] =3D { > + { "INT3492", 0 }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(acpi, pca9685_acpi_ids); > +#endif > + > +#ifdef CONFIG_OF > =C2=A0static const struct of_device_id pca9685_dt_ids[] =3D { > =C2=A0 { .compatible =3D "nxp,pca9685-pwm", }, > =C2=A0 { /* sentinel */ } > =C2=A0}; > =C2=A0MODULE_DEVICE_TABLE(of, pca9685_dt_ids); > +#endif > =C2=A0 > =C2=A0static struct i2c_driver pca9685_i2c_driver =3D { > =C2=A0 .driver =3D { > =C2=A0 .name =3D "pca9685-pwm", > - .of_match_table =3D pca9685_dt_ids, > + .acpi_match_table =3D ACPI_PTR(pca9685_acpi_ids), > + .of_match_table =3D of_match_ptr(pca9685_dt_ids), > =C2=A0 }, > =C2=A0 .probe =3D pca9685_pwm_probe, > =C2=A0 .remove =3D pca9685_pwm_remove, --=20 Andy Shevchenko Intel Finland Oy -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751779AbbKINxl (ORCPT ); Mon, 9 Nov 2015 08:53:41 -0500 Received: from mga11.intel.com ([192.55.52.93]:16618 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751213AbbKINxg (ORCPT ); Mon, 9 Nov 2015 08:53:36 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,266,1444719600"; d="scan'208";a="846689771" Message-ID: <1447077216.31665.73.camel@linux.intel.com> Subject: Re: [PATCH v4 5/5] pwm-pca9685: enable ACPI device found on Galileo Gen2 From: Andy Shevchenko To: linux-acpi@vger.kernel.org, linux-i2c@vger.kernel.org, Lee Jones , Wolfram Sang , "Rafael J . Wysocki" , Mika Westerberg , "Puustinen, Ismo" , linux-kernel@vger.kernel.org Cc: Thierry Reding Date: Mon, 09 Nov 2015 15:53:36 +0200 In-Reply-To: <1445591805-28886-6-git-send-email-andriy.shevchenko@linux.intel.com> References: <1445591805-28886-1-git-send-email-andriy.shevchenko@linux.intel.com> <1445591805-28886-6-git-send-email-andriy.shevchenko@linux.intel.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.1-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2015-10-23 at 12:16 +0300, Andy Shevchenko wrote: > There is a chip connected to i2c bus on Intel Galileo Gen2 board. > Enable it via > ACPI ID INT3492. Thierry, ping? > > Cc: Thierry Reding > Signed-off-by: Andy Shevchenko > --- >  drivers/pwm/Kconfig       |  2 +- >  drivers/pwm/pwm-pca9685.c | 20 ++++++++++++++++---- >  2 files changed, 17 insertions(+), 5 deletions(-) > > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index 062630a..bb114ef 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -242,7 +242,7 @@ config PWM_MXS >   >  config PWM_PCA9685 >   tristate "NXP PCA9685 PWM driver" > - depends on OF && I2C > + depends on I2C >   select REGMAP_I2C >   help >     Generic PWM framework driver for NXP PCA9685 LED > controller. > diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c > index 70448a6..117fccf 100644 > --- a/drivers/pwm/pwm-pca9685.c > +++ b/drivers/pwm/pwm-pca9685.c > @@ -19,9 +19,11 @@ >   * this program.  If not, see . >   */ >   > +#include >  #include >  #include >  #include > +#include >  #include >  #include >  #include > @@ -297,7 +299,6 @@ static const struct regmap_config > pca9685_regmap_i2c_config = { >  static int pca9685_pwm_probe(struct i2c_client *client, >   const struct i2c_device_id *id) >  { > - struct device_node *np = client->dev.of_node; >   struct pca9685 *pca; >   int ret; >   int mode2; > @@ -320,12 +321,12 @@ static int pca9685_pwm_probe(struct i2c_client > *client, >   >   regmap_read(pca->regmap, PCA9685_MODE2, &mode2); >   > - if (of_property_read_bool(np, "invert")) > + if (device_property_read_bool(&client->dev, "invert")) >   mode2 |= MODE2_INVRT; >   else >   mode2 &= ~MODE2_INVRT; >   > - if (of_property_read_bool(np, "open-drain")) > + if (device_property_read_bool(&client->dev, "open-drain")) >   mode2 &= ~MODE2_OUTDRV; >   else >   mode2 |= MODE2_OUTDRV; > @@ -363,16 +364,27 @@ static const struct i2c_device_id pca9685_id[] > = { >  }; >  MODULE_DEVICE_TABLE(i2c, pca9685_id); >   > +#ifdef CONFIG_ACPI > +static const struct acpi_device_id pca9685_acpi_ids[] = { > + { "INT3492", 0 }, > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(acpi, pca9685_acpi_ids); > +#endif > + > +#ifdef CONFIG_OF >  static const struct of_device_id pca9685_dt_ids[] = { >   { .compatible = "nxp,pca9685-pwm", }, >   { /* sentinel */ } >  }; >  MODULE_DEVICE_TABLE(of, pca9685_dt_ids); > +#endif >   >  static struct i2c_driver pca9685_i2c_driver = { >   .driver = { >   .name = "pca9685-pwm", > - .of_match_table = pca9685_dt_ids, > + .acpi_match_table = ACPI_PTR(pca9685_acpi_ids), > + .of_match_table = of_match_ptr(pca9685_dt_ids), >   }, >   .probe = pca9685_pwm_probe, >   .remove = pca9685_pwm_remove, -- Andy Shevchenko Intel Finland Oy