x86 pn544 blackbay

diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile
index 0d4e3af..bbfaf7c 100644 (file)
--- a/arch/x86/platform/intel-mid/device_libs/Makefile
+++ b/arch/x86/platform/intel-mid/device_libs/Makefile
@@ -40,7 +40,7 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_RMI4_I2C)          += platform_s3202.o
 else
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)           += platform_s3202.o
 endif
-obj-$(CONFIG_PN544_NFC)                                        += platform_pn544.o
+obj-$(CONFIG_PN544_HCI_NFC)                            += platform_pn544.o
 obj-$(CONFIG_GPIO_PCA953X)                             += platform_tca6416.o
 obj-$(CONFIG_SENSORS_LIS3LV02D)                                += platform_lis331.o
 obj-$(CONFIG_CHARGER_SMB347)                           += platform_smb347.o

diff --git a/arch/x86/platform/intel-mid/device_libs/platform_pn544.c b/arch/x86/platform/intel-mid/device_libs/platform_pn544.c
index 28a91f8..2b256ce 100644 (file)
--- a/arch/x86/platform/intel-mid/device_libs/platform_pn544.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_pn544.c
@@ -12,90 +12,145 @@
 
 #include <linux/gpio.h>
 #include <linux/i2c.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
 #include <linux/nfc/pn544.h>
 #include <asm/intel-mid.h>
 #include "platform_pn544.h"
 
+/* MFLD NFC controller (PN544) platform init */
 
-static unsigned int nfc_host_int_gpio, nfc_enable_gpio, nfc_fw_reset_gpio;
+static int nfc_gpio_enable = -1;
+static int nfc_gpio_fw_reset = -1;
+static int nfc_gpio_irq = -1;
 
-static int pn544_nfc_request_resources(struct i2c_client *client)
+static int pn544_request_resources(struct i2c_client *client)
 {
        int ret;
 
-       ret = gpio_request(nfc_host_int_gpio, NFC_HOST_INT_GPIO);
-       if (ret) {
-               dev_err(&client->dev, "Request NFC INT GPIO fails %d\n", ret);
-               return -1;
-       }
+       ret = gpio_request_one(nfc_gpio_enable, GPIOF_OUT_INIT_LOW,
+                              "NFC enable");
+       if (ret < 0)
+               return ret;
 
-       ret = gpio_direction_input(nfc_host_int_gpio);
-       if (ret) {
-               dev_err(&client->dev, "Set GPIO Direction fails %d\n", ret);
-               goto err_int;
-       }
+       ret = gpio_request_one(nfc_gpio_fw_reset, GPIOF_OUT_INIT_LOW,
+                              "NFC FW reset");
+       if (ret < 0)
+               goto fail_free_enable;
 
-       ret = gpio_request(nfc_enable_gpio, NFC_ENABLE_GPIO);
-       if (ret) {
-               dev_err(&client->dev,
-                       "Request for NFC Enable GPIO fails %d\n", ret);
-               goto err_int;
-       }
+       ret = gpio_request_one(nfc_gpio_irq, GPIOF_IN, "NFC interrupt\n");
+       if (ret < 0)
+               goto fail_free_reset;
 
-       ret = gpio_direction_output(nfc_enable_gpio, 0);
-       if (ret) {
-               dev_err(&client->dev, "Set GPIO Direction fails %d\n", ret);
-               goto err_enable;
-       }
+       client->irq = gpio_to_irq(nfc_gpio_irq);
+       return 0;
 
-       ret = gpio_request(nfc_fw_reset_gpio, NFC_FW_RESET_GPIO);
-       if (ret) {
-               dev_err(&client->dev,
-                       "Request for NFC FW Reset GPIO fails %d\n", ret);
-               goto err_enable;
-       }
+fail_free_reset:
+       gpio_free(nfc_gpio_fw_reset);
+fail_free_enable:
+       gpio_free(nfc_gpio_enable);
 
-       ret = gpio_direction_output(nfc_fw_reset_gpio, 0);
-       if (ret) {
-               dev_err(&client->dev, "Set GPIO Direction fails %d\n", ret);
-               goto err_fw;
-       }
+       return ret;
+}
 
-       return 0;
-err_fw:
-       gpio_free(nfc_fw_reset_gpio);
-err_enable:
-       gpio_free(nfc_enable_gpio);
-err_int:
-       gpio_free(nfc_host_int_gpio);
-       return -1;
+static void pn544_free_resources(void)
+{
+       gpio_free(nfc_gpio_irq);
+       gpio_free(nfc_gpio_fw_reset);
+       gpio_free(nfc_gpio_enable);
 }
 
-void *pn544_platform_data(void *info)
+static void pn544_enable(int fw)
 {
-       struct i2c_board_info *i2c_info = (struct i2c_board_info *) info;
-       static struct pn544_i2c_platform_data pn544_nfc_platform_data;
+       gpio_set_value(nfc_gpio_enable, 1);
+       gpio_set_value(nfc_gpio_fw_reset, !!fw);
+}
 
-       memset(&pn544_nfc_platform_data, 0x00,
-               sizeof(struct pn544_i2c_platform_data));
+static void pn544_disable(void)
+{
+       gpio_set_value(nfc_gpio_enable, 0);
+}
 
-       nfc_host_int_gpio = get_gpio_by_name(NFC_HOST_INT_GPIO);
-       if (nfc_host_int_gpio == -1)
-               return NULL;
-       nfc_enable_gpio = get_gpio_by_name(NFC_ENABLE_GPIO);
-       if (nfc_enable_gpio  == -1)
+static int pn544_get_gpio(int type)
+{
+       int gpio = -1;
+
+       switch (type) {
+       case NFC_GPIO_ENABLE:
+               gpio = nfc_gpio_enable;
+               break;
+       case NFC_GPIO_FW_RESET:
+               gpio = nfc_gpio_fw_reset;
+               break;
+       case NFC_GPIO_IRQ:
+               gpio = nfc_gpio_irq;
+               break;
+       }
+
+       return gpio;
+}
+
+static struct regulator_consumer_supply pn544_regs_supply[] = {
+       REGULATOR_SUPPLY("Vdd_IO", "2-0028"),
+       REGULATOR_SUPPLY("VBat", "2-0028"),
+       REGULATOR_SUPPLY("VSim", "2-0028"),
+};
+
+static struct regulator_init_data pn544_regs_init_data = {
+       .constraints = {
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       },
+       .num_consumer_supplies  = ARRAY_SIZE(pn544_regs_supply),
+       .consumer_supplies = pn544_regs_supply,
+};
+
+static struct fixed_voltage_config pn544_regs_config = {
+       .supply_name            = "pn544_regs",
+       .microvolts             = 1800000,
+       .gpio                   = -EINVAL,
+       .init_data              = &pn544_regs_init_data,
+};
+
+static struct platform_device pn544_regs = {
+       .name           = "reg-fixed-voltage",
+       .id             = 2,
+       .dev = {
+               .platform_data  = &pn544_regs_config,
+       },
+};
+
+void *pn544_platform_data(void *info)
+{
+       static struct pn544_nfc_platform_data pdata = {
+               .request_resources      = pn544_request_resources,
+               .free_resources         = pn544_free_resources,
+               .enable                 = pn544_enable,
+               .disable                = pn544_disable,
+               .get_gpio               = pn544_get_gpio,
+       };
+
+       nfc_gpio_enable = get_gpio_by_name("NFC-enable");
+       if (nfc_gpio_enable < 0) {
+               pr_err("failed to get NFC enable GPIO\n");
                return NULL;
-       nfc_fw_reset_gpio = get_gpio_by_name(NFC_FW_RESET_GPIO);
-       if (nfc_fw_reset_gpio == -1)
+       }
+
+       nfc_gpio_fw_reset = get_gpio_by_name("NFC-reset");
+       if (nfc_gpio_fw_reset < 0) {
+               pr_err("failed to get NFC reset GPIO\n");
                return NULL;
+       }
 
-       pn544_nfc_platform_data.irq_gpio = nfc_host_int_gpio;
-       pn544_nfc_platform_data.ven_gpio = nfc_enable_gpio;
-       pn544_nfc_platform_data.firm_gpio = nfc_fw_reset_gpio;
+       nfc_gpio_irq = get_gpio_by_name("NFC-intr");
+       if (nfc_gpio_irq < 0) {
+               pr_err("failed to get NFC interrupt GPIO\n");
+               return NULL;
+       }
 
-       i2c_info->irq = nfc_host_int_gpio + INTEL_MID_IRQ_OFFSET;
-       pn544_nfc_platform_data.request_resources =
-               pn544_nfc_request_resources;
+       if (platform_device_register(&pn544_regs)) {
+               pr_err("failed to register NFC fixed voltage regulator\n");
+               return NULL;
+       }
 
-       return &pn544_nfc_platform_data;
+       return &pdata;
 }