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

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

NFC: nxp-nci: Convert to use GPIO descriptor 



Since we got rid of platform data, the driver may use
GPIO descriptor directly.

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 3b0b2783

drivers/nfc/nxp-nci/core.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 */



#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/module.h>

#include <linux/nfc.h>

drivers/nfc/nxp-nci/i2c.c

+15 −45
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include <linux/module.h>

#include <linux/nfc.h>

#include <linux/gpio/consumer.h>

#include <linux/of_gpio.h>

#include <linux/of_irq.h>

#include <asm/unaligned.h>



#include <net/nfc/nfc.h>
@@ -37,8 +35,8 @@ struct nxp_nci_i2c_phy { 
	struct i2c_client *i2c_dev;

	struct nci_dev *ndev;



	unsigned int gpio_en;

	unsigned int gpio_fw;

	struct gpio_desc *gpiod_en;

	struct gpio_desc *gpiod_fw;



	int hard_fault; /*

			 * < 0 if hardware error occurred (e.g. i2c err)
@@ -51,8 +49,8 @@ static int nxp_nci_i2c_set_mode(void *phy_id, 
{

	struct nxp_nci_i2c_phy *phy = (struct nxp_nci_i2c_phy *) phy_id;



	gpio_set_value(phy->gpio_fw, (mode == NXP_NCI_MODE_FW) ? 1 : 0);

	gpio_set_value(phy->gpio_en, (mode != NXP_NCI_MODE_COLD) ? 1 : 0);

	gpiod_set_value(phy->gpiod_fw, (mode == NXP_NCI_MODE_FW) ? 1 : 0);

	gpiod_set_value(phy->gpiod_en, (mode != NXP_NCI_MODE_COLD) ? 1 : 0);

	usleep_range(10000, 15000);



	if (mode == NXP_NCI_MODE_COLD)
@@ -252,30 +250,18 @@ static irqreturn_t nxp_nci_i2c_irq_thread_fn(int irq, void *phy_id) 
static int nxp_nci_i2c_parse_devtree(struct i2c_client *client)

{

	struct nxp_nci_i2c_phy *phy = i2c_get_clientdata(client);

	struct device_node *pp;

	int r;



	pp = client->dev.of_node;

	if (!pp)

		return -ENODEV;



	r = of_get_named_gpio(pp, "enable-gpios", 0);

	if (r == -EPROBE_DEFER)

		r = of_get_named_gpio(pp, "enable-gpios", 0);

	if (r < 0) {

		nfc_err(&client->dev, "Failed to get EN gpio, error: %d\n", r);

		return r;

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

	if (IS_ERR(phy->gpiod_en)) {

		nfc_err(&client->dev, "Failed to get EN gpio\n");

		return PTR_ERR(phy->gpiod_en);

	}

	phy->gpio_en = r;



	r = of_get_named_gpio(pp, "firmware-gpios", 0);

	if (r == -EPROBE_DEFER)

		r = of_get_named_gpio(pp, "firmware-gpios", 0);

	if (r < 0) {

		nfc_err(&client->dev, "Failed to get FW gpio, error: %d\n", r);

		return r;

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

	if (IS_ERR(phy->gpiod_fw)) {

		nfc_err(&client->dev, "Failed to get FW gpio\n");

		return PTR_ERR(phy->gpiod_fw);

	}

	phy->gpio_fw = r;



	return 0;

}
@@ -283,19 +269,15 @@ 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;

	struct gpio_desc *gpiod_en, *gpiod_fw;



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

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

	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);



	if (IS_ERR(gpiod_en) || IS_ERR(gpiod_fw)) {

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

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

		return -EINVAL;

	}



	phy->gpio_en = desc_to_gpio(gpiod_en);

	phy->gpio_fw = desc_to_gpio(gpiod_fw);



	return 0;

}
@@ -331,24 +313,12 @@ static int nxp_nci_i2c_probe(struct i2c_client *client, 
		r = nxp_nci_i2c_acpi_config(phy);

		if (r < 0)

			goto probe_exit;

		goto nci_probe;

	} else {

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

		r = -EINVAL;

		goto probe_exit;

	}



	r = devm_gpio_request_one(&phy->i2c_dev->dev, phy->gpio_en,

				  GPIOF_OUT_INIT_LOW, "nxp_nci_en");

	if (r < 0)

		goto probe_exit;



	r = devm_gpio_request_one(&phy->i2c_dev->dev, phy->gpio_fw,

				  GPIOF_OUT_INIT_LOW, "nxp_nci_fw");

	if (r < 0)

		goto probe_exit;



nci_probe:

	r = nxp_nci_probe(phy, &client->dev, &i2c_phy_ops,

			  NXP_NCI_I2C_MAX_PAYLOAD, &phy->ndev);

	if (r < 0)