On Wed, Mar 15, 2017 at 09:58:00PM +0200, Andy Shevchenko wrote:
> In order to make GPIO ACPI library stricter prepare users of
> gpiod_get_index() to correctly behave when there no mapping is
> provided by firmware.
>
> Here we add explicit mapping between _CRS GpioIo() resources and
> their names used in the driver.
>
> Signed-off-by: Andy Shevchenko <[email protected]>
Thanks I replaced the commit.
/Jarkko
> ---
> - Fix copy'n'paste typo in i2c driver
> drivers/char/tpm/st33zp24/i2c.c | 23 ++++++++++++++++++++---
> drivers/char/tpm/st33zp24/spi.c | 23 ++++++++++++++++++++---
> 2 files changed, 40 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c
> index 028a9cd76b63..1b10e38f214e 100644
> --- a/drivers/char/tpm/st33zp24/i2c.c
> +++ b/drivers/char/tpm/st33zp24/i2c.c
> @@ -111,6 +111,13 @@ static const struct st33zp24_phy_ops i2c_phy_ops = {
> .recv = st33zp24_i2c_recv,
> };
>
> +static const struct acpi_gpio_params lpcpd_gpios = { 1, 0, false };
> +
> +static const struct acpi_gpio_mapping acpi_st33zp24_gpios[] = {
> + { "lpcpd-gpios", &lpcpd_gpios, 1 },
> + {},
> +};
> +
> static int st33zp24_i2c_acpi_request_resources(struct i2c_client *client)
> {
> struct tpm_chip *chip = i2c_get_clientdata(client);
> @@ -118,10 +125,14 @@ static int st33zp24_i2c_acpi_request_resources(struct
> i2c_client *client)
> struct st33zp24_i2c_phy *phy = tpm_dev->phy_id;
> struct gpio_desc *gpiod_lpcpd;
> struct device *dev = &client->dev;
> + int ret;
> +
> + ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev),
> acpi_st33zp24_gpios);
> + if (ret)
> + return ret;
>
> /* Get LPCPD GPIO from ACPI */
> - gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,
> - GPIOD_OUT_HIGH);
> + gpiod_lpcpd = devm_gpiod_get(dev, "lpcpd", GPIOD_OUT_HIGH);
> if (IS_ERR(gpiod_lpcpd)) {
> dev_err(&client->dev,
> "Failed to retrieve lpcpd-gpios from acpi.\n");
> @@ -268,8 +279,14 @@ static int st33zp24_i2c_probe(struct i2c_client *client,
> static int st33zp24_i2c_remove(struct i2c_client *client)
> {
> struct tpm_chip *chip = i2c_get_clientdata(client);
> + int ret;
>
> - return st33zp24_remove(chip);
> + ret = st33zp24_remove(chip);
> + if (ret)
> + return ret;
> +
> + acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev));
> + return 0;
> }
>
> static const struct i2c_device_id st33zp24_i2c_id[] = {
> diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c
> index 9f5a0117098c..c69d15198f84 100644
> --- a/drivers/char/tpm/st33zp24/spi.c
> +++ b/drivers/char/tpm/st33zp24/spi.c
> @@ -230,6 +230,13 @@ static const struct st33zp24_phy_ops spi_phy_ops = {
> .recv = st33zp24_spi_recv,
> };
>
> +static const struct acpi_gpio_params lpcpd_gpios = { 1, 0, false };
> +
> +static const struct acpi_gpio_mapping acpi_st33zp24_gpios[] = {
> + { "lpcpd-gpios", &lpcpd_gpios, 1 },
> + {},
> +};
> +
> static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev)
> {
> struct tpm_chip *chip = spi_get_drvdata(spi_dev);
> @@ -237,10 +244,14 @@ static int st33zp24_spi_acpi_request_resources(struct
> spi_device *spi_dev)
> struct st33zp24_spi_phy *phy = tpm_dev->phy_id;
> struct gpio_desc *gpiod_lpcpd;
> struct device *dev = &spi_dev->dev;
> + int ret;
> +
> + ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev),
> acpi_st33zp24_gpios);
> + if (ret)
> + return ret;
>
> /* Get LPCPD GPIO from ACPI */
> - gpiod_lpcpd = devm_gpiod_get_index(dev, "TPM IO LPCPD", 1,
> - GPIOD_OUT_HIGH);
> + gpiod_lpcpd = devm_gpiod_get(dev, "lpcpd", GPIOD_OUT_HIGH);
> if (IS_ERR(gpiod_lpcpd)) {
> dev_err(dev, "Failed to retrieve lpcpd-gpios from acpi.\n");
> phy->io_lpcpd = -1;
> @@ -385,8 +396,14 @@ static int st33zp24_spi_probe(struct spi_device *dev)
> static int st33zp24_spi_remove(struct spi_device *dev)
> {
> struct tpm_chip *chip = spi_get_drvdata(dev);
> + int ret;
>
> - return st33zp24_remove(chip);
> + ret = st33zp24_remove(chip);
> + if (ret)
> + return ret;
> +
> + acpi_dev_remove_driver_gpios(ACPI_COMPANION(&dev->dev));
> + return 0;
> }
>
> static const struct spi_device_id st33zp24_spi_id[] = {
> --
> 2.11.0
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
tpmdd-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel
