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

Commit 099d03f0 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

NFC: nxp-nci: Add GPIO ACPI mapping table 



In order to unify GPIO resource request prepare gpiod_get_index()
to behave correctly when there is no mapping 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>
Tested-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 43201767

drivers/nfc/nxp-nci/i2c.c

+16 −2
Original line number Diff line number Diff line
@@ -247,6 +247,15 @@ static irqreturn_t nxp_nci_i2c_irq_thread_fn(int irq, void *phy_id) 
	return IRQ_NONE;

}



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

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



static const struct acpi_gpio_mapping acpi_nxp_nci_gpios[] = {

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

	{ "firmware-gpios", &firmware_gpios, 1 },

	{ }

};



static int nxp_nci_i2c_parse_devtree(struct i2c_client *client)

{

	struct nxp_nci_i2c_phy *phy = i2c_get_clientdata(client);
@@ -269,9 +278,14 @@ static int nxp_nci_i2c_parse_devtree(struct i2c_client *client) 
static int nxp_nci_i2c_acpi_config(struct nxp_nci_i2c_phy *phy)

{

	struct i2c_client *client = phy->i2c_dev;

	int r;



	phy->gpiod_en = devm_gpiod_get_index(&client->dev, NULL, 2, GPIOD_OUT_LOW);

	phy->gpiod_fw = devm_gpiod_get_index(&client->dev, NULL, 1, GPIOD_OUT_LOW);

	r = devm_acpi_dev_add_driver_gpios(&client->dev, acpi_nxp_nci_gpios);

	if (r)

		return r;



	phy->gpiod_en = devm_gpiod_get(&client->dev, "enable", GPIOD_OUT_LOW);

	phy->gpiod_fw = devm_gpiod_get(&client->dev, "firmware", GPIOD_OUT_LOW);



	if (IS_ERR(phy->gpiod_en) || IS_ERR(phy->gpiod_fw)) {

		nfc_err(&client->dev, "No GPIOs\n");