openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFC: pn544: 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>
This commit is contained in:
Andy Shevchenko 2017-03-28 12:36:38 +03:00 committed by Samuel Ortiz
parent 182d4e8608
commit a4a0eb783b
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/nfc/pn544/i2c.c
View File

@ -869,22 +869,34 @@ static void pn544_hci_i2c_fw_work(struct work_struct *work)
} }
} }
static const struct acpi_gpio_params enable_gpios = { 1, 0, false };
static const struct acpi_gpio_params firmware_gpios = { 2, 0, false };
static const struct acpi_gpio_mapping acpi_pn544_gpios[] = {
{ "enable-gpios", &enable_gpios, 1 },
{ "firmware-gpios", &firmware_gpios, 1 },
{ },
};
static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client) static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client)
{ {
struct pn544_i2c_phy *phy = i2c_get_clientdata(client); struct pn544_i2c_phy *phy = i2c_get_clientdata(client);
struct device *dev = &client->dev; struct device *dev = &client->dev;
int ret;
ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), acpi_pn544_gpios);
if (ret)
return ret;
/* Get EN GPIO from ACPI */ /* Get EN GPIO from ACPI */
phy->gpiod_en = devm_gpiod_get_index(dev, PN544_GPIO_NAME_EN, 1, phy->gpiod_en = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
GPIOD_OUT_LOW);
if (IS_ERR(phy->gpiod_en)) { if (IS_ERR(phy->gpiod_en)) {
nfc_err(dev, "Unable to get EN GPIO\n"); nfc_err(dev, "Unable to get EN GPIO\n");
return PTR_ERR(phy->gpiod_en); return PTR_ERR(phy->gpiod_en);
} }
/* Get FW GPIO from ACPI */ /* Get FW GPIO from ACPI */
phy->gpiod_fw = devm_gpiod_get_index(dev, PN544_GPIO_NAME_FW, 2, phy->gpiod_fw = devm_gpiod_get(dev, "firmware", GPIOD_OUT_LOW);
GPIOD_OUT_LOW);
if (IS_ERR(phy->gpiod_fw)) { if (IS_ERR(phy->gpiod_fw)) {
nfc_err(dev, "Unable to get FW GPIO\n"); nfc_err(dev, "Unable to get FW GPIO\n");
return PTR_ERR(phy->gpiod_fw); return PTR_ERR(phy->gpiod_fw);
@ -996,6 +1008,7 @@ static int pn544_hci_i2c_remove(struct i2c_client *client)
if (phy->powered) if (phy->powered)
pn544_hci_i2c_disable(phy); pn544_hci_i2c_disable(phy);
acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev));
return 0; return 0;
} }