mm/migrate: correct failure handling if !hugepage_migration_support()

[firefly-linux-kernel-4.4.55.git] / drivers / extcon / extcon-palmas.c

diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
index 89fdd05c5fd61a39cb75f7c9488f261a9e04412a..2aea4bcdd7f3944abe04f60997157f5222b52eb1 100644 (file)
--- a/drivers/extcon/extcon-palmas.c
+++ b/drivers/extcon/extcon-palmas.c
@@ -78,20 +78,24 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
 
 static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
 {
-       unsigned int set;
+       unsigned int set, id_src;
        struct palmas_usb *palmas_usb = _palmas_usb;
 
        palmas_read(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
                PALMAS_USB_ID_INT_LATCH_SET, &set);
+       palmas_read(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
+               PALMAS_USB_ID_INT_SRC, &id_src);
 
-       if (set & PALMAS_USB_ID_INT_SRC_ID_GND) {
+       if ((set & PALMAS_USB_ID_INT_SRC_ID_GND) &&
+                               (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
                palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
                        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);
                dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
-       } else if (set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) {
+       } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) &&
+                               (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) {
                palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
                        PALMAS_USB_ID_INT_LATCH_CLR,
                        PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT);
@@ -103,6 +107,11 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
                palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
                extcon_set_cable_state(&palmas_usb->edev, "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);
+               dev_info(palmas_usb->dev, " USB-HOST cable is attached\n");
        }
 
        return IRQ_HANDLED;
@@ -135,7 +144,7 @@ static void palmas_enable_irq(struct palmas_usb *palmas_usb)
 static int palmas_usb_probe(struct platform_device *pdev)
 {
        struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
-       struct palmas_usb_platform_data *pdata = pdev->dev.platform_data;
+       struct palmas_usb_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct device_node *node = pdev->dev.of_node;
        struct palmas_usb *palmas_usb;
        int status;
@@ -178,9 +187,10 @@ static int palmas_usb_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, palmas_usb);
 
        palmas_usb->edev.supported_cable = palmas_extcon_cable;
+       palmas_usb->edev.dev.parent = palmas_usb->dev;
        palmas_usb->edev.mutually_exclusive = mutually_exclusive;
 
-       status = extcon_dev_register(&palmas_usb->edev, palmas_usb->dev);
+       status = extcon_dev_register(&palmas_usb->edev);
        if (status) {
                dev_err(&pdev->dev, "failed to register extcon device\n");
                return status;
@@ -268,7 +278,9 @@ static const struct dev_pm_ops palmas_pm_ops = {
 
 static struct of_device_id of_palmas_match_tbl[] = {
        { .compatible = "ti,palmas-usb", },
+       { .compatible = "ti,palmas-usb-vid", },
        { .compatible = "ti,twl6035-usb", },
+       { .compatible = "ti,twl6035-usb-vid", },
        { /* end */ }
 };