diff mbox

[v1,2/2] NFC: pn544: Add GPIO ACPI mapping table

Message ID 20170228140809.84921-2-andriy.shevchenko@linux.intel.com (mailing list archive)
State Not Applicable
Delegated to: Samuel Ortiz
Headers show

Commit Message

Andy Shevchenko Feb. 28, 2017, 2:08 p.m. UTC 
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>
---
 drivers/nfc/pn544/i2c.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
diff mbox

Patch

diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index 2df3176205c4..5364bbd5ce55 100644
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -874,6 +874,15 @@  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_default_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);
@@ -982,6 +991,11 @@  static int pn544_hci_i2c_probe(struct i2c_client *client,
 		return -ENODEV;
 	}
 
+	r = acpi_dev_add_driver_gpios(ACPI_COMPANION(&client->dev),
+				      acpi_pn544_default_gpios);
+	if (r)
+		return r;
+
 	phy = devm_kzalloc(&client->dev, sizeof(struct pn544_i2c_phy),
 			   GFP_KERNEL);
 	if (!phy)
@@ -1092,6 +1106,7 @@  static int pn544_hci_i2c_remove(struct i2c_client *client)
 		pdata->free_resources();
 	}
 
+	acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev));
 	return 0;
 }