Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4a0eb78 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Samuel Ortiz
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 182d4e86

drivers/nfc/pn544/i2c.c

+17 −4
Original line number Diff line number Diff line
@@ -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)

{

	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;

}