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

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

NFC: st21nfca: 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 99f2064e

drivers/nfc/st21nfca/i2c.c

+14 −4
Original line number Original line Diff line number Diff line
@@ -501,14 +501,25 @@ static struct nfc_phy_ops i2c_phy_ops = { 
	.disable = st21nfca_hci_i2c_disable,

	.disable = st21nfca_hci_i2c_disable,

};

};





static const struct acpi_gpio_params enable_gpios = { 1, 0, false };



static const struct acpi_gpio_mapping acpi_st21nfca_gpios[] = {

	{ "enable-gpios", &enable_gpios, 1 },

	{},

};



static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client)

static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client)

{

{

	struct st21nfca_i2c_phy *phy = i2c_get_clientdata(client);

	struct st21nfca_i2c_phy *phy = i2c_get_clientdata(client);

	struct device *dev = &client->dev;

	struct device *dev = &client->dev;

	int ret;



	ret = devm_acpi_dev_add_driver_gpios(dev, acpi_st21nfca_gpios);

	if (ret)

		return ret;





	/* Get EN GPIO from ACPI */

	/* Get EN GPIO from ACPI */

	phy->gpiod_ena = devm_gpiod_get_index(dev, ST21NFCA_GPIO_NAME_EN, 1,

	phy->gpiod_ena = devm_gpiod_get(dev, ST21NFCA_GPIO_NAME_EN, GPIOD_OUT_LOW);

					      GPIOD_OUT_LOW);

	if (IS_ERR(phy->gpiod_ena)) {

	if (IS_ERR(phy->gpiod_ena)) {

		nfc_err(dev, "Unable to get ENABLE GPIO\n");

		nfc_err(dev, "Unable to get ENABLE GPIO\n");

		return PTR_ERR(phy->gpiod_ena);

		return PTR_ERR(phy->gpiod_ena);
@@ -523,8 +534,7 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client) 
	struct device *dev = &client->dev;

	struct device *dev = &client->dev;





	/* Get GPIO from device tree */

	/* Get GPIO from device tree */

	phy->gpiod_ena = devm_gpiod_get_index(dev, ST21NFCA_GPIO_NAME_EN, 0,

	phy->gpiod_ena = devm_gpiod_get(dev, ST21NFCA_GPIO_NAME_EN, GPIOD_OUT_HIGH);

					      GPIOD_OUT_HIGH);

	if (IS_ERR(phy->gpiod_ena)) {

	if (IS_ERR(phy->gpiod_ena)) {

		nfc_err(dev, "Failed to request enable pin\n");

		nfc_err(dev, "Failed to request enable pin\n");

		return PTR_ERR(phy->gpiod_ena);

		return PTR_ERR(phy->gpiod_ena);