Commit e2c518c6 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Samuel Ortiz

NFC: pn544: Convert to use GPIO descriptor

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

This change fixes a potential issue of double freeing GPIOs in ACPI
case by converting to devm_gpiod_get().
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent e7f6ccaa
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
#include <linux/crc-ccitt.h> #include <linux/crc-ccitt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/of_gpio.h>
#include <linux/of_irq.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -164,8 +161,9 @@ struct pn544_i2c_phy { ...@@ -164,8 +161,9 @@ struct pn544_i2c_phy {
struct i2c_client *i2c_dev; struct i2c_client *i2c_dev;
struct nfc_hci_dev *hdev; struct nfc_hci_dev *hdev;
unsigned int gpio_en; struct gpio_desc *gpiod_en;
unsigned int gpio_fw; struct gpio_desc *gpiod_fw;
unsigned int en_polarity; unsigned int en_polarity;
u8 hw_variant; u8 hw_variant;
...@@ -207,19 +205,18 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy) ...@@ -207,19 +205,18 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy)
nfc_info(&phy->i2c_dev->dev, "Detecting nfc_en polarity\n"); nfc_info(&phy->i2c_dev->dev, "Detecting nfc_en polarity\n");
/* Disable fw download */ /* Disable fw download */
gpio_set_value_cansleep(phy->gpio_fw, 0); gpiod_set_value_cansleep(phy->gpiod_fw, 0);
for (polarity = 0; polarity < 2; polarity++) { for (polarity = 0; polarity < 2; polarity++) {
phy->en_polarity = polarity; phy->en_polarity = polarity;
retry = 3; retry = 3;
while (retry--) { while (retry--) {
/* power off */ /* power off */
gpio_set_value_cansleep(phy->gpio_en, gpiod_set_value_cansleep(phy->gpiod_en, !phy->en_polarity);
!phy->en_polarity);
usleep_range(10000, 15000); usleep_range(10000, 15000);
/* power on */ /* power on */
gpio_set_value_cansleep(phy->gpio_en, phy->en_polarity); gpiod_set_value_cansleep(phy->gpiod_en, phy->en_polarity);
usleep_range(10000, 15000); usleep_range(10000, 15000);
/* send reset */ /* send reset */
...@@ -238,14 +235,13 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy) ...@@ -238,14 +235,13 @@ static void pn544_hci_i2c_platform_init(struct pn544_i2c_phy *phy)
"Could not detect nfc_en polarity, fallback to active high\n"); "Could not detect nfc_en polarity, fallback to active high\n");
out: out:
gpio_set_value_cansleep(phy->gpio_en, !phy->en_polarity); gpiod_set_value_cansleep(phy->gpiod_en, !phy->en_polarity);
} }
static void pn544_hci_i2c_enable_mode(struct pn544_i2c_phy *phy, int run_mode) static void pn544_hci_i2c_enable_mode(struct pn544_i2c_phy *phy, int run_mode)
{ {
gpio_set_value_cansleep(phy->gpio_fw, gpiod_set_value_cansleep(phy->gpiod_fw, run_mode == PN544_FW_MODE ? 1 : 0);
run_mode == PN544_FW_MODE ? 1 : 0); gpiod_set_value_cansleep(phy->gpiod_en, phy->en_polarity);
gpio_set_value_cansleep(phy->gpio_en, phy->en_polarity);
usleep_range(10000, 15000); usleep_range(10000, 15000);
phy->run_mode = run_mode; phy->run_mode = run_mode;
...@@ -268,14 +264,14 @@ static void pn544_hci_i2c_disable(void *phy_id) ...@@ -268,14 +264,14 @@ static void pn544_hci_i2c_disable(void *phy_id)
{ {
struct pn544_i2c_phy *phy = phy_id; struct pn544_i2c_phy *phy = phy_id;
gpio_set_value_cansleep(phy->gpio_fw, 0); gpiod_set_value_cansleep(phy->gpiod_fw, 0);
gpio_set_value_cansleep(phy->gpio_en, !phy->en_polarity); gpiod_set_value_cansleep(phy->gpiod_en, !phy->en_polarity);
usleep_range(10000, 15000); usleep_range(10000, 15000);
gpio_set_value_cansleep(phy->gpio_en, phy->en_polarity); gpiod_set_value_cansleep(phy->gpiod_en, phy->en_polarity);
usleep_range(10000, 15000); usleep_range(10000, 15000);
gpio_set_value_cansleep(phy->gpio_en, !phy->en_polarity); gpiod_set_value_cansleep(phy->gpiod_en, !phy->en_polarity);
usleep_range(10000, 15000); usleep_range(10000, 15000);
phy->powered = 0; phy->powered = 0;
...@@ -876,96 +872,47 @@ static void pn544_hci_i2c_fw_work(struct work_struct *work) ...@@ -876,96 +872,47 @@ static void pn544_hci_i2c_fw_work(struct work_struct *work)
static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client) static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client)
{ {
struct pn544_i2c_phy *phy = i2c_get_clientdata(client); struct pn544_i2c_phy *phy = i2c_get_clientdata(client);
struct gpio_desc *gpiod_en, *gpiod_fw;
struct device *dev = &client->dev; struct device *dev = &client->dev;
/* Get EN GPIO from ACPI */ /* Get EN GPIO from ACPI */
gpiod_en = devm_gpiod_get_index(dev, PN544_GPIO_NAME_EN, 1, phy->gpiod_en = devm_gpiod_get_index(dev, PN544_GPIO_NAME_EN, 1,
GPIOD_OUT_LOW); GPIOD_OUT_LOW);
if (IS_ERR(gpiod_en)) { if (IS_ERR(phy->gpiod_en)) {
nfc_err(dev, "Unable to get EN GPIO\n"); nfc_err(dev, "Unable to get EN GPIO\n");
return -ENODEV; return PTR_ERR(phy->gpiod_en);
} }
phy->gpio_en = desc_to_gpio(gpiod_en);
/* Get FW GPIO from ACPI */ /* Get FW GPIO from ACPI */
gpiod_fw = devm_gpiod_get_index(dev, PN544_GPIO_NAME_FW, 2, phy->gpiod_fw = devm_gpiod_get_index(dev, PN544_GPIO_NAME_FW, 2,
GPIOD_OUT_LOW); GPIOD_OUT_LOW);
if (IS_ERR(gpiod_fw)) { if (IS_ERR(phy->gpiod_fw)) {
nfc_err(dev, "Unable to get FW GPIO\n"); nfc_err(dev, "Unable to get FW GPIO\n");
return -ENODEV; return PTR_ERR(phy->gpiod_fw);
} }
phy->gpio_fw = desc_to_gpio(gpiod_fw);
return 0; return 0;
} }
static int pn544_hci_i2c_of_request_resources(struct i2c_client *client) static int pn544_hci_i2c_of_request_resources(struct i2c_client *client)
{ {
struct pn544_i2c_phy *phy = i2c_get_clientdata(client); struct pn544_i2c_phy *phy = i2c_get_clientdata(client);
struct device_node *pp; struct device *dev = &client->dev;
int ret;
pp = client->dev.of_node;
if (!pp) {
ret = -ENODEV;
goto err_dt;
}
/* Obtention of EN GPIO from device tree */
ret = of_get_named_gpio(pp, "enable-gpios", 0);
if (ret < 0) {
if (ret != -EPROBE_DEFER)
nfc_err(&client->dev,
"Failed to get EN gpio, error: %d\n", ret);
goto err_dt;
}
phy->gpio_en = ret;
/* Configuration of EN GPIO */
ret = gpio_request(phy->gpio_en, PN544_GPIO_NAME_EN);
if (ret) {
nfc_err(&client->dev, "Fail EN pin\n");
goto err_dt;
}
ret = gpio_direction_output(phy->gpio_en, 0);
if (ret) {
nfc_err(&client->dev, "Fail EN pin direction\n");
goto err_gpio_en;
}
/* Obtention of FW GPIO from device tree */ /* Obtaining EN GPIO from device tree */
ret = of_get_named_gpio(pp, "firmware-gpios", 0); phy->gpiod_en = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
if (ret < 0) { if (IS_ERR(phy->gpiod_en)) {
if (ret != -EPROBE_DEFER) nfc_err(dev, "Failed to get EN gpio\n");
nfc_err(&client->dev, return PTR_ERR(phy->gpiod_en);
"Failed to get FW gpio, error: %d\n", ret);
goto err_gpio_en;
} }
phy->gpio_fw = ret;
/* Configuration of FW GPIO */ /* Obtaining FW GPIO from device tree */
ret = gpio_request(phy->gpio_fw, PN544_GPIO_NAME_FW); phy->gpiod_fw = devm_gpiod_get(dev, "firmware", GPIOD_OUT_LOW);
if (ret) { if (IS_ERR(phy->gpiod_fw)) {
nfc_err(&client->dev, "Fail FW pin\n"); nfc_err(dev, "Failed to get FW gpio\n");
goto err_gpio_en; return PTR_ERR(phy->gpiod_fw);
}
ret = gpio_direction_output(phy->gpio_fw, 0);
if (ret) {
nfc_err(&client->dev, "Fail FW pin direction\n");
goto err_gpio_fw;
} }
return 0; return 0;
err_gpio_fw:
gpio_free(phy->gpio_fw);
err_gpio_en:
gpio_free(phy->gpio_en);
err_dt:
return ret;
} }
static int pn544_hci_i2c_probe(struct i2c_client *client, static int pn544_hci_i2c_probe(struct i2c_client *client,
...@@ -1020,7 +967,7 @@ static int pn544_hci_i2c_probe(struct i2c_client *client, ...@@ -1020,7 +967,7 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,
PN544_HCI_I2C_DRIVER_NAME, phy); PN544_HCI_I2C_DRIVER_NAME, phy);
if (r < 0) { if (r < 0) {
nfc_err(&client->dev, "Unable to register IRQ handler\n"); nfc_err(&client->dev, "Unable to register IRQ handler\n");
goto err_rti; return r;
} }
r = pn544_hci_probe(phy, &i2c_phy_ops, LLC_SHDLC_NAME, r = pn544_hci_probe(phy, &i2c_phy_ops, LLC_SHDLC_NAME,
...@@ -1035,10 +982,6 @@ static int pn544_hci_i2c_probe(struct i2c_client *client, ...@@ -1035,10 +982,6 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,
err_hci: err_hci:
free_irq(client->irq, phy); free_irq(client->irq, phy);
err_rti:
gpio_free(phy->gpio_en);
gpio_free(phy->gpio_fw);
return r; return r;
} }
...@@ -1059,9 +1002,6 @@ static int pn544_hci_i2c_remove(struct i2c_client *client) ...@@ -1059,9 +1002,6 @@ static int pn544_hci_i2c_remove(struct i2c_client *client)
free_irq(client->irq, phy); free_irq(client->irq, phy);
gpio_free(phy->gpio_en);
gpio_free(phy->gpio_fw);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment