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>

diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index 327c33df5b225dd900ed94d2c58bdb364c1e6741..6f2a9dff6b7139e46ca25af8575885e870c63808 100644 (file)
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -869,22 +869,34 @@ exit_state_wait_secure_write_answer:
        }
 }
 
+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)
 {
        struct pn544_i2c_phy *phy = i2c_get_clientdata(client);
        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 */
-       phy->gpiod_en = devm_gpiod_get_index(dev, PN544_GPIO_NAME_EN, 1,
-                                            GPIOD_OUT_LOW);
+       phy->gpiod_en = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
        if (IS_ERR(phy->gpiod_en)) {
                nfc_err(dev, "Unable to get EN GPIO\n");
                return PTR_ERR(phy->gpiod_en);
        }
 
        /* Get FW GPIO from ACPI */
-       phy->gpiod_fw = devm_gpiod_get_index(dev, PN544_GPIO_NAME_FW, 2,
-                                            GPIOD_OUT_LOW);
+       phy->gpiod_fw = devm_gpiod_get(dev, "firmware", GPIOD_OUT_LOW);
        if (IS_ERR(phy->gpiod_fw)) {
                nfc_err(dev, "Unable to get FW GPIO\n");
                return PTR_ERR(phy->gpiod_fw);
@@ -996,6 +1008,7 @@ static int pn544_hci_i2c_remove(struct i2c_client *client)
        if (phy->powered)
                pn544_hci_i2c_disable(phy);
 
+       acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev));
        return 0;
 }