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

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

NFC: st-nci: 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 75719b2b

drivers/nfc/st-nci/i2c.c

+13 −4
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ 
#define ST_NCI_DRIVER_NAME "st_nci"

#define ST_NCI_I2C_DRIVER_NAME "st_nci_i2c"



#define ST_NCI_GPIO_NAME_RESET "reset"



struct st_nci_i2c_phy {

	struct i2c_client *i2c_dev;

	struct llt_ndlc *ndlc;
@@ -205,14 +203,25 @@ static struct nfc_phy_ops i2c_phy_ops = { 
	.disable = st_nci_i2c_disable,

};



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



static const struct acpi_gpio_mapping acpi_st_nci_gpios[] = {

	{ "reset-gpios", &reset_gpios, 1 },

	{},

};



static int st_nci_i2c_acpi_request_resources(struct i2c_client *client)

{

	struct st_nci_i2c_phy *phy = i2c_get_clientdata(client);

	struct device *dev = &client->dev;

	int r;



	r = devm_acpi_dev_add_driver_gpios(dev, acpi_st_nci_gpios);

	if (r)

		return r;



	/* Get RESET GPIO from ACPI */

	phy->gpiod_reset = devm_gpiod_get_index(dev, ST_NCI_GPIO_NAME_RESET,

						1, GPIOD_OUT_HIGH);

	phy->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);

	if (IS_ERR(phy->gpiod_reset)) {

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

		return -ENODEV;

drivers/nfc/st-nci/spi.c

+13 −4
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ 
#define ST_NCI_DRIVER_NAME "st_nci"

#define ST_NCI_SPI_DRIVER_NAME "st_nci_spi"



#define ST_NCI_GPIO_NAME_RESET "reset"



struct st_nci_spi_phy {

	struct spi_device *spi_dev;

	struct llt_ndlc *ndlc;
@@ -220,14 +218,25 @@ static struct nfc_phy_ops spi_phy_ops = { 
	.disable = st_nci_spi_disable,

};



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



static const struct acpi_gpio_mapping acpi_st_nci_gpios[] = {

	{ "reset-gpios", &reset_gpios, 1 },

	{},

};



static int st_nci_spi_acpi_request_resources(struct spi_device *spi_dev)

{

	struct st_nci_spi_phy *phy = spi_get_drvdata(spi_dev);

	struct device *dev = &spi_dev->dev;

	int r;



	r = devm_acpi_dev_add_driver_gpios(dev, acpi_st_nci_gpios);

	if (r)

		return r;



	/* Get RESET GPIO from ACPI */

	phy->gpiod_reset = devm_gpiod_get_index(dev, ST_NCI_GPIO_NAME_RESET,

						1, GPIOD_OUT_HIGH);

	phy->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);

	if (IS_ERR(phy->gpiod_reset)) {

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

		return PTR_ERR(phy->gpiod_reset);