These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / extcon / extcon-palmas.c
index 11c6757..93c30a8 100644 (file)
 #include <linux/mfd/palmas.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
+#include <linux/workqueue.h>
 
-static const char *palmas_extcon_cable[] = {
-       [0] = "USB",
-       [1] = "USB-HOST",
-       NULL,
-};
+#define USB_GPIO_DEBOUNCE_MS   20      /* ms */
 
-static const int mutually_exclusive[] = {0x3, 0x0};
+static const unsigned int palmas_extcon_cable[] = {
+       EXTCON_USB,
+       EXTCON_USB_HOST,
+       EXTCON_NONE,
+};
 
 static void palmas_usb_wakeup(struct palmas *palmas, int enable)
 {
@@ -49,6 +52,7 @@ static void palmas_usb_wakeup(struct palmas *palmas, int enable)
 static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
 {
        struct palmas_usb *palmas_usb = _palmas_usb;
+       struct extcon_dev *edev = palmas_usb->edev;
        unsigned int vbus_line_state;
 
        palmas_read(palmas_usb->palmas, PALMAS_INTERRUPT_BASE,
@@ -57,7 +61,7 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
        if (vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS) {
                if (palmas_usb->linkstat != PALMAS_USB_STATE_VBUS) {
                        palmas_usb->linkstat = PALMAS_USB_STATE_VBUS;
-                       extcon_set_cable_state(palmas_usb->edev, "USB", true);
+                       extcon_set_cable_state_(edev, EXTCON_USB, true);
                        dev_info(palmas_usb->dev, "USB cable is attached\n");
                } else {
                        dev_dbg(palmas_usb->dev,
@@ -66,7 +70,7 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
        } else if (!(vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS)) {
                if (palmas_usb->linkstat == PALMAS_USB_STATE_VBUS) {
                        palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
-                       extcon_set_cable_state(palmas_usb->edev, "USB", false);
+                       extcon_set_cable_state_(edev, EXTCON_USB, false);
                        dev_info(palmas_usb->dev, "USB cable is detached\n");
                } else {
                        dev_dbg(palmas_usb->dev,
@@ -81,6 +85,7 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
 {
        unsigned int set, id_src;
        struct palmas_usb *palmas_usb = _palmas_usb;
+       struct extcon_dev *edev = palmas_usb->edev;
 
        palmas_read(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
                PALMAS_USB_ID_INT_LATCH_SET, &set);
@@ -93,7 +98,7 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
                        PALMAS_USB_ID_INT_LATCH_CLR,
                        PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND);
                palmas_usb->linkstat = PALMAS_USB_STATE_ID;
-               extcon_set_cable_state(palmas_usb->edev, "USB-HOST", true);
+               extcon_set_cable_state_(edev, EXTCON_USB_HOST, true);
                dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
        } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) &&
                                (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) {
@@ -101,36 +106,71 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
                        PALMAS_USB_ID_INT_LATCH_CLR,
                        PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT);
                palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
-               extcon_set_cable_state(palmas_usb->edev, "USB-HOST", false);
+               extcon_set_cable_state_(edev, EXTCON_USB_HOST, false);
                dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
        } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) &&
                                (!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) {
                palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
-               extcon_set_cable_state(palmas_usb->edev, "USB-HOST", false);
+               extcon_set_cable_state_(edev, EXTCON_USB_HOST, false);
                dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
        } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) &&
                                (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
                palmas_usb->linkstat = PALMAS_USB_STATE_ID;
-               extcon_set_cable_state(palmas_usb->edev, "USB-HOST", true);
+               extcon_set_cable_state_(edev, EXTCON_USB_HOST, true);
                dev_info(palmas_usb->dev, " USB-HOST cable is attached\n");
        }
 
        return IRQ_HANDLED;
 }
 
+static void palmas_gpio_id_detect(struct work_struct *work)
+{
+       int id;
+       struct palmas_usb *palmas_usb = container_of(to_delayed_work(work),
+                                                    struct palmas_usb,
+                                                    wq_detectid);
+       struct extcon_dev *edev = palmas_usb->edev;
+
+       if (!palmas_usb->id_gpiod)
+               return;
+
+       id = gpiod_get_value_cansleep(palmas_usb->id_gpiod);
+
+       if (id) {
+               extcon_set_cable_state_(edev, EXTCON_USB_HOST, false);
+               dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
+       } else {
+               extcon_set_cable_state_(edev, EXTCON_USB_HOST, true);
+               dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
+       }
+}
+
+static irqreturn_t palmas_gpio_id_irq_handler(int irq, void *_palmas_usb)
+{
+       struct palmas_usb *palmas_usb = _palmas_usb;
+
+       queue_delayed_work(system_power_efficient_wq, &palmas_usb->wq_detectid,
+                          palmas_usb->sw_debounce_jiffies);
+
+       return IRQ_HANDLED;
+}
+
 static void palmas_enable_irq(struct palmas_usb *palmas_usb)
 {
        palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
                PALMAS_USB_VBUS_CTRL_SET,
                PALMAS_USB_VBUS_CTRL_SET_VBUS_ACT_COMP);
 
-       palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
-               PALMAS_USB_ID_CTRL_SET, PALMAS_USB_ID_CTRL_SET_ID_ACT_COMP);
+       if (palmas_usb->enable_id_detection) {
+               palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
+                            PALMAS_USB_ID_CTRL_SET,
+                            PALMAS_USB_ID_CTRL_SET_ID_ACT_COMP);
 
-       palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
-               PALMAS_USB_ID_INT_EN_HI_SET,
-               PALMAS_USB_ID_INT_EN_HI_SET_ID_GND |
-               PALMAS_USB_ID_INT_EN_HI_SET_ID_FLOAT);
+               palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
+                            PALMAS_USB_ID_INT_EN_HI_SET,
+                            PALMAS_USB_ID_INT_EN_HI_SET_ID_GND |
+                            PALMAS_USB_ID_INT_EN_HI_SET_ID_FLOAT);
+       }
 
        if (palmas_usb->enable_vbus_detection)
                palmas_vbus_irq_handler(palmas_usb->vbus_irq, palmas_usb);
@@ -169,20 +209,37 @@ static int palmas_usb_probe(struct platform_device *pdev)
                        palmas_usb->wakeup = pdata->wakeup;
        }
 
+       palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id",
+                                                       GPIOD_IN);
+       if (IS_ERR(palmas_usb->id_gpiod)) {
+               dev_err(&pdev->dev, "failed to get id gpio\n");
+               return PTR_ERR(palmas_usb->id_gpiod);
+       }
+
+       if (palmas_usb->enable_id_detection && palmas_usb->id_gpiod) {
+               palmas_usb->enable_id_detection = false;
+               palmas_usb->enable_gpio_id_detection = true;
+       }
+
+       if (palmas_usb->enable_gpio_id_detection) {
+               u32 debounce;
+
+               if (of_property_read_u32(node, "debounce-delay-ms", &debounce))
+                       debounce = USB_GPIO_DEBOUNCE_MS;
+
+               status = gpiod_set_debounce(palmas_usb->id_gpiod,
+                                           debounce * 1000);
+               if (status < 0)
+                       palmas_usb->sw_debounce_jiffies = msecs_to_jiffies(debounce);
+       }
+
+       INIT_DELAYED_WORK(&palmas_usb->wq_detectid, palmas_gpio_id_detect);
+
        palmas->usb = palmas_usb;
        palmas_usb->palmas = palmas;
 
        palmas_usb->dev  = &pdev->dev;
 
-       palmas_usb->id_otg_irq = regmap_irq_get_virq(palmas->irq_data,
-                                               PALMAS_ID_OTG_IRQ);
-       palmas_usb->id_irq = regmap_irq_get_virq(palmas->irq_data,
-                                               PALMAS_ID_IRQ);
-       palmas_usb->vbus_otg_irq = regmap_irq_get_virq(palmas->irq_data,
-                                               PALMAS_VBUS_OTG_IRQ);
-       palmas_usb->vbus_irq = regmap_irq_get_virq(palmas->irq_data,
-                                               PALMAS_VBUS_IRQ);
-
        palmas_usb_wakeup(palmas, palmas_usb->wakeup);
 
        platform_set_drvdata(pdev, palmas_usb);
@@ -193,17 +250,18 @@ static int palmas_usb_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "failed to allocate extcon device\n");
                return -ENOMEM;
        }
-       palmas_usb->edev->name = kstrdup(node->name, GFP_KERNEL);
-       palmas_usb->edev->mutually_exclusive = mutually_exclusive;
 
        status = devm_extcon_dev_register(&pdev->dev, palmas_usb->edev);
        if (status) {
                dev_err(&pdev->dev, "failed to register extcon device\n");
-               kfree(palmas_usb->edev->name);
                return status;
        }
 
        if (palmas_usb->enable_id_detection) {
+               palmas_usb->id_otg_irq = regmap_irq_get_virq(palmas->irq_data,
+                                                            PALMAS_ID_OTG_IRQ);
+               palmas_usb->id_irq = regmap_irq_get_virq(palmas->irq_data,
+                                                        PALMAS_ID_IRQ);
                status = devm_request_threaded_irq(palmas_usb->dev,
                                palmas_usb->id_irq,
                                NULL, palmas_id_irq_handler,
@@ -213,12 +271,35 @@ static int palmas_usb_probe(struct platform_device *pdev)
                if (status < 0) {
                        dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
                                        palmas_usb->id_irq, status);
-                       kfree(palmas_usb->edev->name);
+                       return status;
+               }
+       } else if (palmas_usb->enable_gpio_id_detection) {
+               palmas_usb->gpio_id_irq = gpiod_to_irq(palmas_usb->id_gpiod);
+               if (palmas_usb->gpio_id_irq < 0) {
+                       dev_err(&pdev->dev, "failed to get id irq\n");
+                       return palmas_usb->gpio_id_irq;
+               }
+               status = devm_request_threaded_irq(&pdev->dev,
+                                                  palmas_usb->gpio_id_irq,
+                                                  NULL,
+                                                  palmas_gpio_id_irq_handler,
+                                                  IRQF_TRIGGER_RISING |
+                                                  IRQF_TRIGGER_FALLING |
+                                                  IRQF_ONESHOT,
+                                                  "palmas_usb_id",
+                                                  palmas_usb);
+               if (status < 0) {
+                       dev_err(&pdev->dev,
+                               "failed to request handler for id irq\n");
                        return status;
                }
        }
 
        if (palmas_usb->enable_vbus_detection) {
+               palmas_usb->vbus_otg_irq = regmap_irq_get_virq(palmas->irq_data,
+                                                      PALMAS_VBUS_OTG_IRQ);
+               palmas_usb->vbus_irq = regmap_irq_get_virq(palmas->irq_data,
+                                                          PALMAS_VBUS_IRQ);
                status = devm_request_threaded_irq(palmas_usb->dev,
                                palmas_usb->vbus_irq, NULL,
                                palmas_vbus_irq_handler,
@@ -228,12 +309,13 @@ static int palmas_usb_probe(struct platform_device *pdev)
                if (status < 0) {
                        dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
                                        palmas_usb->vbus_irq, status);
-                       kfree(palmas_usb->edev->name);
                        return status;
                }
        }
 
        palmas_enable_irq(palmas_usb);
+       /* perform initial detection */
+       palmas_gpio_id_detect(&palmas_usb->wq_detectid.work);
        device_set_wakeup_capable(&pdev->dev, true);
        return 0;
 }
@@ -242,7 +324,7 @@ static int palmas_usb_remove(struct platform_device *pdev)
 {
        struct palmas_usb *palmas_usb = platform_get_drvdata(pdev);
 
-       kfree(palmas_usb->edev->name);
+       cancel_delayed_work_sync(&palmas_usb->wq_detectid);
 
        return 0;
 }
@@ -257,6 +339,8 @@ static int palmas_usb_suspend(struct device *dev)
                        enable_irq_wake(palmas_usb->vbus_irq);
                if (palmas_usb->enable_id_detection)
                        enable_irq_wake(palmas_usb->id_irq);
+               if (palmas_usb->enable_gpio_id_detection)
+                       enable_irq_wake(palmas_usb->gpio_id_irq);
        }
        return 0;
 }
@@ -270,6 +354,8 @@ static int palmas_usb_resume(struct device *dev)
                        disable_irq_wake(palmas_usb->vbus_irq);
                if (palmas_usb->enable_id_detection)
                        disable_irq_wake(palmas_usb->id_irq);
+               if (palmas_usb->enable_gpio_id_detection)
+                       disable_irq_wake(palmas_usb->gpio_id_irq);
        }
        return 0;
 };