FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-09 04:51:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFC: fdp: Add GPIO ACPI mapping table

Browse Source 
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>
This commit is contained in:
Andy Shevchenko 2017-06-19 13:08:51 +03:00 committed by Samuel Ortiz
parent 7b9fcda91e
commit a5d410949a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/nfc/fdp/i2c.c
View File

@ -27,7 +27,6 @@
#define FDP_I2C_DRIVER_NAME "fdp_nci_i2c" #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_TYPE_NAME "clock-type"
#define FDP_DP_CLOCK_FREQ_NAME "clock-freq" #define FDP_DP_CLOCK_FREQ_NAME "clock-freq"
#define FDP_DP_FW_VSC_CFG_NAME "fw-vsc-cfg" #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"); *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) static int fdp_nci_i2c_probe(struct i2c_client *client)
{ {
struct fdp_i2c_phy *phy; struct fdp_i2c_phy *phy;
@ -321,10 +327,12 @@ static int fdp_nci_i2c_probe(struct i2c_client *client)
return r; return r;
} }
/* Requesting the power gpio */ r = devm_acpi_dev_add_driver_gpios(dev, acpi_fdp_gpios);
phy->power_gpio = devm_gpiod_get(dev, FDP_DP_POWER_GPIO_NAME, if (r)
GPIOD_OUT_LOW); 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)) { if (IS_ERR(phy->power_gpio)) {
nfc_err(dev, "Power GPIO request failed\n"); nfc_err(dev, "Power GPIO request failed\n");
return PTR_ERR(phy->power_gpio); return PTR_ERR(phy->power_gpio);