From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753432AbbCaHrF (ORCPT ); Tue, 31 Mar 2015 03:47:05 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:55322 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752445AbbCaHrB (ORCPT ); Tue, 31 Mar 2015 03:47:01 -0400 X-AuditID: cbfee61b-f79d76d0000024d6-8d-551a50f15350 From: Robert Baldyga To: cw00.choi@samsung.com Cc: myungjoo.ham@samsung.com, rogerq@ti.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, m.szyprowski@samsung.com, Robert Baldyga Subject: [PATCH 2/4] extcon: usb-gpio: add support for VBUS detection Date: Tue, 31 Mar 2015 09:46:01 +0200 Message-id: <1427787963-23562-3-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1427787963-23562-1-git-send-email-r.baldyga@samsung.com> References: <1427787963-23562-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnluLIzCtJLcpLzFFi42I5/e+xoO7HAKlQg4ajphbXvzxntZh/5Byr xeVdc9gs1h65y25xu3EFm8WDwzvZLXoeaTmwe/RtWcXocfzGdiaPz5vkApijuGxSUnMyy1KL 9O0SuDKerutjLGi3rXj56RhrA+NmvS5GTg4JAROJxXvOsEPYYhIX7q1n62Lk4hASmM4ocXlZ LxtIQkjgJ6PExKMZIDabgI7Elu8TGLsYOThEBCQlWvaZgdQzC6xmlPh+Zx8zSI2wgKvERqCr QGwWAVWJN3ffgtXzAsWvNxZA7JKTOHlsMiuIzSngJjFv33JGiFWuErOufmafwMi7gJFhFaNo akFyQXFSeq6RXnFibnFpXrpecn7uJkZw8DyT3sG4qsHiEKMAB6MSD2/FHclQIdbEsuLK3EOM EhzMSiK8ez4ChXhTEiurUovy44tKc1KLDzFKc7AoifMq2beFCAmkJ5akZqemFqQWwWSZODil Ghi3cdrn3Wvn958x/8nLN9uNbi55zrDVd8eWj1PVVor3fT6RUSAg/ovL5x7jv2VeL99ZPFe+ eqpLJi9wtUWJfaNTeOba37+VdBXb1SsNWBbP1I54Np91d23NIv6pPfym5moKzGllyT3s87mM vBZeOvJ9ZfKmv8ku3fv/t3lsvHtsscorzxOPa/4qsRRnJBpqMRcVJwIAKX9qmxoCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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] disconn. | H | L [3] USB-HOST | L | H [4] USB-HOST | L | L In case we have only one of these signals: - ID pin only: we can distinguish between states [1] and [3]. - VBUS pin only: we can distinguish between states [1] and [2]. Signed-off-by: Robert Baldyga --- drivers/extcon/extcon-usb-gpio.c | 159 +++++++++++++++++++++++++++++---------- 1 file changed, 118 insertions(+), 41 deletions(-) diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c index f6aa99d..02ff40e 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,21 +54,50 @@ static const char *usb_extcon_cable[] = { NULL, }; +/* + * State | ID | VBUS + * ---------------------------------- + * [1] USB | H | H + * [2] disconn. | H | L + * [3] USB-HOST | L | H + * [4] USB-HOST | L | L + * + */ + 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 */ + + /* + * If we don't have id pin, we want to detect states [1] and [2], + * so we set id to value 1. + */ + id = info->id_gpiod ? + gpiod_get_value_cansleep(info->id_gpiod) : 1; + + /* + * If we don't have vbus pin, we want to detect states [1] and [3], + * so we set vbus to value 1. + */ + vbus = info->vbus_gpiod ? + gpiod_get_value_cansleep(info->vbus_gpiod) : 1; + + if (id == 0) { + /* ID = 0 means USB HOST cable attached. */ + extcon_set_cable_state(info->edev, + usb_extcon_cable[EXTCON_CABLE_USB], + false); + extcon_set_cable_state(info->edev, + usb_extcon_cable[EXTCON_CABLE_USB_HOST], + true); + } else if (vbus) { + /* ID = 1 and VBUS = 1 means USB cable attached. */ extcon_set_cable_state(info->edev, usb_extcon_cable[EXTCON_CABLE_USB_HOST], false); @@ -74,17 +105,13 @@ static void usb_extcon_detect_cable(struct work_struct *work) 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. - */ + /* ID = 1 and VBUS = 0 means USB cable detached. */ extcon_set_cable_state(info->edev, usb_extcon_cable[EXTCON_CABLE_USB], false); extcon_set_cable_state(info->edev, usb_extcon_cable[EXTCON_CABLE_USB_HOST], - true); + false); } } @@ -113,10 +140,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 +160,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 +232,18 @@ 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) { + disable_irq_wake(info->id_irq); + return ret; + } + } } /* @@ -189,7 +251,10 @@ 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; } @@ -200,12 +265,24 @@ 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) { + enable_irq_wake(info->id_irq); + return ret; + } + } } - 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; } -- 1.9.1