Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752874AbbDBNNm (ORCPT ); Thu, 2 Apr 2015 09:13:42 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:34159 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752692AbbDBNNh (ORCPT ); Thu, 2 Apr 2015 09:13:37 -0400 X-AuditID: cbfee61b-f79d76d0000024d6-7c-551d407f2048 From: Robert Baldyga To: cw00.choi@samsung.com Cc: myungjoo.ham@samsung.com, rogerq@ti.com, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, m.szyprowski@samsung.com, Robert Baldyga Subject: [PATCH v3 2/4] extcon: usb-gpio: add support for VBUS detection Date: Thu, 02 Apr 2015 15:13:03 +0200 Message-id: <1427980385-21285-3-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1427980385-21285-1-git-send-email-r.baldyga@samsung.com> References: <1427980385-21285-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplluLIzCtJLcpLzFFi42I5/e+xoG69g2yowb0PZhbXvzxntZh/5Byr xeVdc9gsFi1rZbZYe+Quu8XtxhVsFg8O72S36Hmk5cDh0bdlFaPH8RvbmTw+b5ILYI7isklJ zcksSy3St0vgylj/eSJjwVy7im03tjA3MB7V72Lk5JAQMJH43/mJHcIWk7hwbz1bFyMXh5DA dEaJR3sesEM4Pxklzk6/xwRSxSagI7Hl+wTGLkYODhEBSYmWfWYgNcwCxxgl3vx+zgJSIyzg IbGsey0rSA2LgKrE3hdgC3gFXCX+7F7JDLFMTuLkscmsIDangJvE3S3bwVqFgGoOrrzFNoGR dwEjwypG0dSC5ILipPRcI73ixNzi0rx0veT83E2M4EB6Jr2DcVWDxSFGAQ5GJR7ejD0yoUKs iWXFlbmHGCU4mJVEeB9oy4YK8aYkVlalFuXHF5XmpBYfYpTmYFES51WybwsREkhPLEnNTk0t SC2CyTJxcEo1MKouzXbcJat+O5fp2ht9iQeqj9QC1z174fr9zzUnx6ze9/Gzah5z+ixrmHeb 5V2+/I6azcXTfOZt9eZfsSJ/dUiy6aTmP+LWhXEVltPeRCsc2tgaeU/W/ih/uPcx3rMX2F1P 51m+70q6+9+U/XJxgW/Ljzd/FlRNXfU+kFdj4sTFXeUNxR6Np5VYijMSDbWYi4oTASkFy90g AgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7939 Lines: 276 This patch adds VBUS pin detection support to extcon-usb-gpio driver. It allows to use this driver with boards which have both VBUS and ID pins, or only one of them. Following table of states presents relationship between this signals and detected cable type: State | ID | VBUS ---------------------------------------- [1] USB | H | H [2] none | H | L [3] USB & USB-HOST | L | H [4] USB-HOST | L | L In case we have only one of these signals: - VBUS only - we want to distinguish between [1] and [2], so ID is always 1. - ID only - we want to distinguish between [1] and [4], so VBUS = ID. Signed-off-by: Robert Baldyga --- drivers/extcon/extcon-usb-gpio.c | 169 +++++++++++++++++++++++++++------------ 1 file changed, 119 insertions(+), 50 deletions(-) diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c index f6aa99d..baf7add 100644 --- a/drivers/extcon/extcon-usb-gpio.c +++ b/drivers/extcon/extcon-usb-gpio.c @@ -32,7 +32,9 @@ struct usb_extcon_info { struct extcon_dev *edev; struct gpio_desc *id_gpiod; + struct gpio_desc *vbus_gpiod; int id_irq; + int vbus_irq; unsigned long debounce_jiffies; struct delayed_work wq_detcable; @@ -52,40 +54,51 @@ static const char *usb_extcon_cable[] = { NULL, }; +/* + * "USB" = VBUS and "USB-HOST" = !ID, so we have: + * + * State | ID | VBUS + * ---------------------------------------- + * [1] USB | H | H + * [2] none | H | L + * [3] USB & USB-HOST | L | H + * [4] USB-HOST | L | L + * + * In case we have only one of these signals: + * - VBUS only - we want to distinguish between [1] and [2], so ID is always 1. + * - ID only - we want to distinguish between [1] and [4], so VBUS = ID. + */ + static void usb_extcon_detect_cable(struct work_struct *work) { int id; + int vbus; struct usb_extcon_info *info = container_of(to_delayed_work(work), struct usb_extcon_info, wq_detcable); - /* check ID and update cable state */ - id = gpiod_get_value_cansleep(info->id_gpiod); - if (id) { - /* - * ID = 1 means USB HOST cable detached. - * As we don't have event for USB peripheral cable attached, - * we simulate USB peripheral attach here. - */ + /* check ID and VBUS and update cable state */ + + id = info->id_gpiod ? + gpiod_get_value_cansleep(info->id_gpiod) : 1; + + vbus = info->vbus_gpiod ? + gpiod_get_value_cansleep(info->vbus_gpiod) : id; + + /* at first we clean states which are no longer active */ + if (id) extcon_set_cable_state(info->edev, - usb_extcon_cable[EXTCON_CABLE_USB_HOST], - false); + usb_extcon_cable[EXTCON_CABLE_USB_HOST], false); + if (!vbus) extcon_set_cable_state(info->edev, - usb_extcon_cable[EXTCON_CABLE_USB], - true); - } else { - /* - * ID = 0 means USB HOST cable attached. - * As we don't have event for USB peripheral cable detached, - * we simulate USB peripheral detach here. - */ + usb_extcon_cable[EXTCON_CABLE_USB], false); + + if (!id) extcon_set_cable_state(info->edev, - usb_extcon_cable[EXTCON_CABLE_USB], - false); + usb_extcon_cable[EXTCON_CABLE_USB_HOST], true); + if (vbus) extcon_set_cable_state(info->edev, - usb_extcon_cable[EXTCON_CABLE_USB_HOST], - true); - } + usb_extcon_cable[EXTCON_CABLE_USB], true); } static irqreturn_t usb_irq_handler(int irq, void *dev_id) @@ -113,10 +126,12 @@ static int usb_extcon_probe(struct platform_device *pdev) return -ENOMEM; info->dev = dev; - info->id_gpiod = devm_gpiod_get(&pdev->dev, "id"); - if (IS_ERR(info->id_gpiod)) { - dev_err(dev, "failed to get ID GPIO\n"); - return PTR_ERR(info->id_gpiod); + info->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id"); + info->vbus_gpiod = devm_gpiod_get_optional(&pdev->dev, "vbus"); + + if (!info->id_gpiod && !info->vbus_gpiod) { + dev_err(dev, "failed to get gpios\n"); + return -ENODEV; } info->edev = devm_extcon_dev_allocate(dev, usb_extcon_cable); @@ -131,27 +146,51 @@ static int usb_extcon_probe(struct platform_device *pdev) return ret; } - ret = gpiod_set_debounce(info->id_gpiod, - USB_GPIO_DEBOUNCE_MS * 1000); + if (info->id_gpiod) + ret = gpiod_set_debounce(info->id_gpiod, + USB_GPIO_DEBOUNCE_MS * 1000); + if (!ret && info->vbus_gpiod) { + ret = gpiod_set_debounce(info->vbus_gpiod, + USB_GPIO_DEBOUNCE_MS * 1000); + if (ret < 0 && info->id_gpiod) + gpiod_set_debounce(info->vbus_gpiod, 0); + } if (ret < 0) info->debounce_jiffies = msecs_to_jiffies(USB_GPIO_DEBOUNCE_MS); INIT_DELAYED_WORK(&info->wq_detcable, usb_extcon_detect_cable); - info->id_irq = gpiod_to_irq(info->id_gpiod); - if (info->id_irq < 0) { - dev_err(dev, "failed to get ID IRQ\n"); - return info->id_irq; + if (info->id_gpiod) { + info->id_irq = gpiod_to_irq(info->id_gpiod); + if (info->id_irq < 0) { + dev_err(dev, "failed to get ID IRQ\n"); + return info->id_irq; + } + ret = devm_request_threaded_irq(dev, info->id_irq, NULL, + usb_irq_handler, + IRQF_TRIGGER_RISING | + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, + pdev->name, info); + if (ret < 0) { + dev_err(dev, "failed to request handler for ID IRQ\n"); + return ret; + } } - - ret = devm_request_threaded_irq(dev, info->id_irq, NULL, - usb_irq_handler, - IRQF_TRIGGER_RISING | - IRQF_TRIGGER_FALLING | IRQF_ONESHOT, - pdev->name, info); - if (ret < 0) { - dev_err(dev, "failed to request handler for ID IRQ\n"); - return ret; + if (info->vbus_gpiod) { + info->vbus_irq = gpiod_to_irq(info->vbus_gpiod); + if (info->vbus_irq < 0) { + dev_err(dev, "failed to get VBUS IRQ\n"); + return info->vbus_irq; + } + ret = devm_request_threaded_irq(dev, info->vbus_irq, NULL, + usb_irq_handler, + IRQF_TRIGGER_RISING | + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, + pdev->name, info); + if (ret < 0) { + dev_err(dev, "failed to request handler for VBUS IRQ\n"); + return ret; + } } platform_set_drvdata(pdev, info); @@ -179,9 +218,16 @@ static int usb_extcon_suspend(struct device *dev) int ret = 0; if (device_may_wakeup(dev)) { - ret = enable_irq_wake(info->id_irq); - if (ret) - return ret; + if (info->id_gpiod) { + ret = enable_irq_wake(info->id_irq); + if (ret) + return ret; + } + if (info->vbus_gpiod) { + ret = enable_irq_wake(info->vbus_irq); + if (ret) + goto err; + } } /* @@ -189,9 +235,17 @@ static int usb_extcon_suspend(struct device *dev) * as GPIOs used behind I2C subsystem might not be * accessible until resume completes. So disable IRQ. */ - disable_irq(info->id_irq); + if (info->id_gpiod) + disable_irq(info->id_irq); + if (info->vbus_gpiod) + disable_irq(info->vbus_irq); return ret; + +err: + if (info->id_gpiod) + disable_irq_wake(info->id_irq); + return ret; } static int usb_extcon_resume(struct device *dev) @@ -200,13 +254,28 @@ static int usb_extcon_resume(struct device *dev) int ret = 0; if (device_may_wakeup(dev)) { - ret = disable_irq_wake(info->id_irq); - if (ret) - return ret; + if (info->id_gpiod) { + ret = disable_irq_wake(info->id_irq); + if (ret) + return ret; + } + if (info->vbus_gpiod) { + ret = disable_irq_wake(info->vbus_irq); + if (ret) + goto err; + } } - enable_irq(info->id_irq); + if (info->id_gpiod) + enable_irq(info->id_irq); + if (info->vbus_gpiod) + enable_irq(info->vbus_irq); + + return ret; +err: + if (info->id_gpiod) + enable_irq_wake(info->id_irq); return ret; } #endif -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/