Commit 0a5942c8 authored by Robert Dolca's avatar Robert Dolca Committed by Samuel Ortiz

NFC: Add ACPI support for NXP PN544

Currently there is no support for ACPI.
This patch uses the following configuration:
	- Device id: NXP5440
	- Pin mapping:
		- 0 IRQ pin
		- 1 enable pin
		- 2 firmware pin
Signed-off-by: default avatarRobert Dolca <robert.dolca@intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 75dda421
...@@ -24,11 +24,13 @@ ...@@ -24,11 +24,13 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/acpi.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/nfc.h> #include <linux/nfc.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/gpio/consumer.h>
#include <linux/platform_data/pn544.h> #include <linux/platform_data/pn544.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
...@@ -41,6 +43,11 @@ ...@@ -41,6 +43,11 @@
#define PN544_I2C_FRAME_HEADROOM 1 #define PN544_I2C_FRAME_HEADROOM 1
#define PN544_I2C_FRAME_TAILROOM 2 #define PN544_I2C_FRAME_TAILROOM 2
/* GPIO names */
#define PN544_GPIO_NAME_IRQ "pn544_irq"
#define PN544_GPIO_NAME_FW "pn544_fw"
#define PN544_GPIO_NAME_EN "pn544_en"
/* framing in HCI mode */ /* framing in HCI mode */
#define PN544_HCI_I2C_LLC_LEN 1 #define PN544_HCI_I2C_LLC_LEN 1
#define PN544_HCI_I2C_LLC_CRC 2 #define PN544_HCI_I2C_LLC_CRC 2
...@@ -58,6 +65,13 @@ static struct i2c_device_id pn544_hci_i2c_id_table[] = { ...@@ -58,6 +65,13 @@ static struct i2c_device_id pn544_hci_i2c_id_table[] = {
MODULE_DEVICE_TABLE(i2c, pn544_hci_i2c_id_table); MODULE_DEVICE_TABLE(i2c, pn544_hci_i2c_id_table);
static const struct acpi_device_id pn544_hci_i2c_acpi_match[] = {
{"NXP5440", 0},
{}
};
MODULE_DEVICE_TABLE(acpi, pn544_hci_i2c_acpi_match);
#define PN544_HCI_I2C_DRIVER_NAME "pn544_hci_i2c" #define PN544_HCI_I2C_DRIVER_NAME "pn544_hci_i2c"
/* /*
...@@ -861,6 +875,90 @@ static void pn544_hci_i2c_fw_work(struct work_struct *work) ...@@ -861,6 +875,90 @@ static void pn544_hci_i2c_fw_work(struct work_struct *work)
} }
} }
static int pn544_hci_i2c_acpi_request_resources(struct i2c_client *client)
{
struct pn544_i2c_phy *phy = i2c_get_clientdata(client);
const struct acpi_device_id *id;
struct gpio_desc *gpiod_en, *gpiod_irq, *gpiod_fw;
struct device *dev;
int ret;
if (!client)
return -EINVAL;
dev = &client->dev;
/* Match the struct device against a given list of ACPI IDs */
id = acpi_match_device(dev->driver->acpi_match_table, dev);
if (!id)
return -ENODEV;
/* Get EN GPIO from ACPI */
gpiod_en = devm_gpiod_get_index(dev, PN544_GPIO_NAME_EN, 1);
if (IS_ERR(gpiod_en)) {
nfc_err(dev,
"Unable to get EN GPIO\n");
return -ENODEV;
}
phy->gpio_en = desc_to_gpio(gpiod_en);
/* Configuration EN GPIO */
ret = gpiod_direction_output(gpiod_en, 0);
if (ret) {
nfc_err(dev, "Fail EN pin direction\n");
return ret;
}
/* Get FW GPIO from ACPI */
gpiod_fw = devm_gpiod_get_index(dev, PN544_GPIO_NAME_FW, 2);
if (IS_ERR(gpiod_fw)) {
nfc_err(dev,
"Unable to get FW GPIO\n");
return -ENODEV;
}
phy->gpio_fw = desc_to_gpio(gpiod_fw);
/* Configuration FW GPIO */
ret = gpiod_direction_output(gpiod_fw, 0);
if (ret) {
nfc_err(dev, "Fail FW pin direction\n");
return ret;
}
/* Get IRQ GPIO */
gpiod_irq = devm_gpiod_get_index(dev, PN544_GPIO_NAME_IRQ, 0);
if (IS_ERR(gpiod_irq)) {
nfc_err(dev,
"Unable to get IRQ GPIO\n");
return -ENODEV;
}
phy->gpio_irq = desc_to_gpio(gpiod_irq);
/* Configure IRQ GPIO */
ret = gpiod_direction_input(gpiod_irq);
if (ret) {
nfc_err(dev, "Fail IRQ pin direction\n");
return ret;
}
/* Map the pin to an IRQ */
ret = gpiod_to_irq(gpiod_irq);
if (ret < 0) {
nfc_err(dev, "Fail pin IRQ mapping\n");
return ret;
}
nfc_info(dev, "GPIO resource, no:%d irq:%d\n",
desc_to_gpio(gpiod_irq), ret);
client->irq = ret;
return 0;
}
#ifdef CONFIG_OF #ifdef CONFIG_OF
static int pn544_hci_i2c_of_request_resources(struct i2c_client *client) static int pn544_hci_i2c_of_request_resources(struct i2c_client *client)
...@@ -886,7 +984,7 @@ static int pn544_hci_i2c_of_request_resources(struct i2c_client *client) ...@@ -886,7 +984,7 @@ static int pn544_hci_i2c_of_request_resources(struct i2c_client *client)
phy->gpio_en = ret; phy->gpio_en = ret;
/* Configuration of EN GPIO */ /* Configuration of EN GPIO */
ret = gpio_request(phy->gpio_en, "pn544_en"); ret = gpio_request(phy->gpio_en, PN544_GPIO_NAME_EN);
if (ret) { if (ret) {
nfc_err(&client->dev, "Fail EN pin\n"); nfc_err(&client->dev, "Fail EN pin\n");
goto err_dt; goto err_dt;
...@@ -908,7 +1006,7 @@ static int pn544_hci_i2c_of_request_resources(struct i2c_client *client) ...@@ -908,7 +1006,7 @@ static int pn544_hci_i2c_of_request_resources(struct i2c_client *client)
phy->gpio_fw = ret; phy->gpio_fw = ret;
/* Configuration of FW GPIO */ /* Configuration of FW GPIO */
ret = gpio_request(phy->gpio_fw, "pn544_fw"); ret = gpio_request(phy->gpio_fw, PN544_GPIO_NAME_FW);
if (ret) { if (ret) {
nfc_err(&client->dev, "Fail FW pin\n"); nfc_err(&client->dev, "Fail FW pin\n");
goto err_gpio_en; goto err_gpio_en;
...@@ -1003,6 +1101,14 @@ static int pn544_hci_i2c_probe(struct i2c_client *client, ...@@ -1003,6 +1101,14 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,
phy->gpio_en = pdata->get_gpio(NFC_GPIO_ENABLE); phy->gpio_en = pdata->get_gpio(NFC_GPIO_ENABLE);
phy->gpio_fw = pdata->get_gpio(NFC_GPIO_FW_RESET); phy->gpio_fw = pdata->get_gpio(NFC_GPIO_FW_RESET);
phy->gpio_irq = pdata->get_gpio(NFC_GPIO_IRQ); phy->gpio_irq = pdata->get_gpio(NFC_GPIO_IRQ);
/* Using ACPI */
} else if (ACPI_HANDLE(&client->dev)) {
r = pn544_hci_i2c_acpi_request_resources(client);
if (r) {
nfc_err(&client->dev,
"Cannot get ACPI data\n");
return r;
}
} else { } else {
nfc_err(&client->dev, "No platform data\n"); nfc_err(&client->dev, "No platform data\n");
return -EINVAL; return -EINVAL;
...@@ -1082,6 +1188,7 @@ static struct i2c_driver pn544_hci_i2c_driver = { ...@@ -1082,6 +1188,7 @@ static struct i2c_driver pn544_hci_i2c_driver = {
.name = PN544_HCI_I2C_DRIVER_NAME, .name = PN544_HCI_I2C_DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(of_pn544_i2c_match), .of_match_table = of_match_ptr(of_pn544_i2c_match),
.acpi_match_table = ACPI_PTR(pn544_hci_i2c_acpi_match),
}, },
.probe = pn544_hci_i2c_probe, .probe = pn544_hci_i2c_probe,
.id_table = pn544_hci_i2c_id_table, .id_table = pn544_hci_i2c_id_table,
......
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