diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-06-19 13:08:47 +0300 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2017-06-22 23:51:44 +0200 |
| commit | 394671e79ee6e9e23ddd673ba5bbae5887f97182 (patch) | |
| tree | 291f048c2dd5d11af37f48a1c88cabdfe079a556 /drivers/nfc | |
| parent | NFC: pn544: Switch to devm_acpi_dev_add_driver_gpios() (diff) | |
| download | linux-dev-394671e79ee6e9e23ddd673ba5bbae5887f97182.tar.xz linux-dev-394671e79ee6e9e23ddd673ba5bbae5887f97182.zip | |
NFC: st21nfca: Add GPIO ACPI mapping table
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 <andriy.shevchenko@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st21nfca/i2c.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 4bff76baa341..3621290807f6 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -501,14 +501,25 @@ static struct nfc_phy_ops i2c_phy_ops = { .disable = st21nfca_hci_i2c_disable, }; +static const struct acpi_gpio_params enable_gpios = { 1, 0, false }; + +static const struct acpi_gpio_mapping acpi_st21nfca_gpios[] = { + { "enable-gpios", &enable_gpios, 1 }, + {}, +}; + static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client) { struct st21nfca_i2c_phy *phy = i2c_get_clientdata(client); struct device *dev = &client->dev; + int ret; + + ret = devm_acpi_dev_add_driver_gpios(dev, acpi_st21nfca_gpios); + if (ret) + return ret; /* Get EN GPIO from ACPI */ - phy->gpiod_ena = devm_gpiod_get_index(dev, ST21NFCA_GPIO_NAME_EN, 1, - GPIOD_OUT_LOW); + phy->gpiod_ena = devm_gpiod_get(dev, ST21NFCA_GPIO_NAME_EN, GPIOD_OUT_LOW); if (IS_ERR(phy->gpiod_ena)) { nfc_err(dev, "Unable to get ENABLE GPIO\n"); return PTR_ERR(phy->gpiod_ena); @@ -523,8 +534,7 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client) struct device *dev = &client->dev; /* Get GPIO from device tree */ - phy->gpiod_ena = devm_gpiod_get_index(dev, ST21NFCA_GPIO_NAME_EN, 0, - GPIOD_OUT_HIGH); + phy->gpiod_ena = devm_gpiod_get(dev, ST21NFCA_GPIO_NAME_EN, GPIOD_OUT_HIGH); if (IS_ERR(phy->gpiod_ena)) { nfc_err(dev, "Failed to request enable pin\n"); return PTR_ERR(phy->gpiod_ena); |