diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-06-19 13:08:51 +0300 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2017-06-22 23:51:44 +0200 |
| commit | a5d410949ab0a8934e9352dad08ad588beae3395 (patch) | |
| tree | b4e55538901b4da26c11fbb9be881f9c1c55aa44 | |
| parent | 7b9fcda91e18f13905e07f0145cc7efbe0e503dc (diff) | |
| download | linux-a5d410949ab0a8934e9352dad08ad588beae3395.tar.bz2 | |
NFC: fdp: 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>
| -rw-r--r-- | drivers/nfc/fdp/i2c.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index c955f1f5139d..c4da50e07bbc 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -27,7 +27,6 @@ #define FDP_I2C_DRIVER_NAME "fdp_nci_i2c" -#define FDP_DP_POWER_GPIO_NAME "power" #define FDP_DP_CLOCK_TYPE_NAME "clock-type" #define FDP_DP_CLOCK_FREQ_NAME "clock-freq" #define FDP_DP_FW_VSC_CFG_NAME "fw-vsc-cfg" @@ -281,6 +280,13 @@ vsc_read_err: *clock_type, *clock_freq, *fw_vsc_cfg != NULL ? "yes" : "no"); } +static const struct acpi_gpio_params power_gpios = { 0, 0, false }; + +static const struct acpi_gpio_mapping acpi_fdp_gpios[] = { + { "power-gpios", &power_gpios, 1 }, + {}, +}; + static int fdp_nci_i2c_probe(struct i2c_client *client) { struct fdp_i2c_phy *phy; @@ -321,10 +327,12 @@ static int fdp_nci_i2c_probe(struct i2c_client *client) return r; } - /* Requesting the power gpio */ - phy->power_gpio = devm_gpiod_get(dev, FDP_DP_POWER_GPIO_NAME, - GPIOD_OUT_LOW); + r = devm_acpi_dev_add_driver_gpios(dev, acpi_fdp_gpios); + if (r) + dev_dbg(dev, "Unable to add GPIO mapping table\n"); + /* Requesting the power gpio */ + phy->power_gpio = devm_gpiod_get(dev, "power", GPIOD_OUT_LOW); if (IS_ERR(phy->power_gpio)) { nfc_err(dev, "Power GPIO request failed\n"); return PTR_ERR(phy->power_gpio); |