From: Chanwoo Choi <cwchoi00@gmail.com> To: Felipe Balbi <balbi@ti.com>, Chanwoo Choi <cw00.choi@samsung.com>, Tony Lindgren <tony@atomide.com>, Rob Herring <robh+dt@kernel.org>, MyungJoo Ham <myungjoo.ham@samsung.com> Cc: Linux OMAP Mailing List <linux-omap@vger.kernel.org>, Linux ARM Kernel Mailing List <linux-arm-kernel@lists.infradead.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: Re: [PATCH] extcon: palmas: add support for using VBUSDET output Date: Sat, 21 Nov 2015 01:34:39 +0900 [thread overview] Message-ID: <564F4B9F.7000100@gmail.com> (raw) In-Reply-To: <87io4wenz5.fsf@saruman.tx.rr.com> Hi Felipe, On 2015. 11. 20. 오후 11:37, Felipe Balbi wrote: > > Hi Chanwoo, > > Chanwoo Choi <cw00.choi@samsung.com> writes: >> Hi Felipe, >> >> On 2015년 11월 20일 14:33, Chanwoo Choi wrote: >>> Hi Felipe, >>> >>> Looks good to me. But I have one comment. >>> >>> On 2015년 11월 13일 02:57, Felipe Balbi wrote: >>>> TPS659038 can remux its GPIO_1 as VBUSDET output, >>>> which can be tied to a SoC GPIO and used as a VBUS >>>> interrupt. >>>> >>>> Beagle X15 uses that, in fact, and without it, I >>>> could not get USB peripheral working with that >>>> board. >>>> >>>> Signed-off-by: Felipe Balbi <balbi@ti.com> >>>> --- >>>> drivers/extcon/extcon-palmas.c | 22 ++++++++++++++++++++-- >>>> 1 file changed, 20 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c >>>> index 93c30a885740..7985d092c069 100644 >>>> --- a/drivers/extcon/extcon-palmas.c >>>> +++ b/drivers/extcon/extcon-palmas.c >>>> @@ -296,10 +296,28 @@ static int palmas_usb_probe(struct platform_device *pdev) >>>> } >>>> >>>> if (palmas_usb->enable_vbus_detection) { >>>> + int irq = platform_get_irq(pdev, 0); >>>> + >>>> + if (irq > 0) { >>>> + /* remux GPIO_1 as VBUSDET */ >>>> + status = palmas_update_bits(palmas, PALMAS_PU_PD_OD_BASE, >>>> + PALMAS_PRIMARY_SECONDARY_PAD1, >>>> + PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_MASK, >>>> + (1 << 3)); >>> >>> PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_SHIFT is appropriate instead of >>> using '3'. > > good point :-) > >>>> + if (status < 0) { >>>> + dev_err(&pdev->dev, "can't remux GPIO1\n"); >>>> + return status; >>>> + } >>>> + >>>> + palmas_usb->vbus_irq = irq; >>>> + } else { >>>> + irq = regmap_irq_get_virq(palmas->irq_data, >>>> + PALMAS_VBUS_IRQ); >>>> + palmas_usb->vbus_irq = 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); >>>> status = devm_request_threaded_irq(palmas_usb->dev, >>>> palmas_usb->vbus_irq, NULL, >>>> palmas_vbus_irq_handler, >>>> >>> >>> Thanks, >>> Chanwoo Choi >>> -- >>> 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/ >>> >> >> If you are OK about following patch, I'll apply it on extcon branch. > > that's perfect, thanks for fixing it :-) > Before applying this patch, I think that there are more generic method? So, I check the extcon-palmas.c driver again. There is similiar case for id detection. In some case, id detection use whether 'enable_id_detection' with own interrupt or 'enable_gpio_id_dectection' with specific h/w gpio like this case of vbus. In result, I implement the following patch for vbus gpio detection. But, I'm not sure because I have not any H/W board for test. If you possible, could you test it with following patch? Thanks, Chanwoo Choi diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index 93c30a8..885ee95 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -216,11 +216,23 @@ static int palmas_usb_probe(struct platform_device *pdev) return PTR_ERR(palmas_usb->id_gpiod); } + palmas_usb->vbus_gpiod = devm_gpiod_get_optional(&pdev->dev, "vbus", + GPIOD_IN); + if (IS_ERR(palmas_usb->vbus_gpiod)) { + dev_err(&pdev->dev, "failed to get vbus gpio\n"); + return PTR_ERR(palmas_usb->vbus_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_vbus_detection && palmas_usb->vbus_gpiod) { + palmas_usb->enable_vbus_detection = false; + palmas_usb->enable_gpio_vbus_detection = true; + } + if (palmas_usb->enable_gpio_id_detection) { u32 debounce; @@ -311,6 +323,40 @@ static int palmas_usb_probe(struct platform_device *pdev) palmas_usb->vbus_irq, status); return status; } + } else if (palmas_usb->enable_gpio_vbus_detection) { + /* remux GPIO_1 as VBUSDET */ + status = palmas_update_bits(palmas, + PALMAS_PU_PD_OD_BASE, + PALMAS_PRIMARY_SECONDARY_PAD1, + PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_MASK, + (1 << PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_SHIFT)); + if (status < 0) { + dev_err(&pdev->dev, "can't remux GPIO1\n"); + return status; + } + + palmas_usb->vbus_otg_irq = regmap_irq_get_virq(palmas->irq_data, + PALMAS_VBUS_OTG_IRQ); + palmas_usb->gpio_vbus_irq = gpiod_to_irq(palmas_usb->vbus_gpiod); + if (palmas_usb->gpio_vbus_irq < 0) { + dev_err(&pdev->dev, "failed to get vbus irq\n"); + return palmas_usb->gpio_vbus_irq; + } + status = devm_request_threaded_irq(&pdev->dev, + palmas_usb->gpio_vbus_irq, + NULL, + palmas_vbus_irq_handler, + IRQF_TRIGGER_FALLING | + IRQF_TRIGGER_RISING | + IRQF_ONESHOT | + IRQF_EARLY_RESUME, + "palmas_usb_vbus", + palmas_usb); + if (status < 0) { + dev_err(&pdev->dev, + "failed to request handler for vbus irq\n"); + return status; + } } palmas_enable_irq(palmas_usb); @@ -337,6 +383,8 @@ static int palmas_usb_suspend(struct device *dev) if (device_may_wakeup(dev)) { if (palmas_usb->enable_vbus_detection) enable_irq_wake(palmas_usb->vbus_irq); + if (palmas_usb->enable_gpio_vbus_detection) + enable_irq_wake(palmas_usb->gpio_vbus_irq); if (palmas_usb->enable_id_detection) enable_irq_wake(palmas_usb->id_irq); if (palmas_usb->enable_gpio_id_detection) @@ -352,6 +400,8 @@ static int palmas_usb_resume(struct device *dev) if (device_may_wakeup(dev)) { if (palmas_usb->enable_vbus_detection) disable_irq_wake(palmas_usb->vbus_irq); + if (palmas_usb->enable_gpio_vbus_detection) + disable_irq_wake(palmas_usb->gpio_vbus_irq); if (palmas_usb->enable_id_detection) disable_irq_wake(palmas_usb->id_irq); if (palmas_usb->enable_gpio_id_detection) diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 13e1d96..7b2526f 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -553,7 +553,9 @@ struct palmas_usb { int vbus_irq; int gpio_id_irq; + int gpio_vbus_irq; struct gpio_desc *id_gpiod; + struct gpio_desc *vbus_gpiod; unsigned long sw_debounce_jiffies; struct delayed_work wq_detectid; @@ -562,6 +564,7 @@ struct palmas_usb { bool enable_vbus_detection; bool enable_id_detection; bool enable_gpio_id_detection; + bool enable_gpio_vbus_detection; }; #define comparator_to_palmas(x) container_of((x), struct palmas_usb, comparator)
WARNING: multiple messages have this Message-ID (diff)
From: cwchoi00@gmail.com (Chanwoo Choi) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] extcon: palmas: add support for using VBUSDET output Date: Sat, 21 Nov 2015 01:34:39 +0900 [thread overview] Message-ID: <564F4B9F.7000100@gmail.com> (raw) In-Reply-To: <87io4wenz5.fsf@saruman.tx.rr.com> Hi Felipe, On 2015. 11. 20. ?? 11:37, Felipe Balbi wrote: > > Hi Chanwoo, > > Chanwoo Choi <cw00.choi@samsung.com> writes: >> Hi Felipe, >> >> On 2015? 11? 20? 14:33, Chanwoo Choi wrote: >>> Hi Felipe, >>> >>> Looks good to me. But I have one comment. >>> >>> On 2015? 11? 13? 02:57, Felipe Balbi wrote: >>>> TPS659038 can remux its GPIO_1 as VBUSDET output, >>>> which can be tied to a SoC GPIO and used as a VBUS >>>> interrupt. >>>> >>>> Beagle X15 uses that, in fact, and without it, I >>>> could not get USB peripheral working with that >>>> board. >>>> >>>> Signed-off-by: Felipe Balbi <balbi@ti.com> >>>> --- >>>> drivers/extcon/extcon-palmas.c | 22 ++++++++++++++++++++-- >>>> 1 file changed, 20 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c >>>> index 93c30a885740..7985d092c069 100644 >>>> --- a/drivers/extcon/extcon-palmas.c >>>> +++ b/drivers/extcon/extcon-palmas.c >>>> @@ -296,10 +296,28 @@ static int palmas_usb_probe(struct platform_device *pdev) >>>> } >>>> >>>> if (palmas_usb->enable_vbus_detection) { >>>> + int irq = platform_get_irq(pdev, 0); >>>> + >>>> + if (irq > 0) { >>>> + /* remux GPIO_1 as VBUSDET */ >>>> + status = palmas_update_bits(palmas, PALMAS_PU_PD_OD_BASE, >>>> + PALMAS_PRIMARY_SECONDARY_PAD1, >>>> + PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_MASK, >>>> + (1 << 3)); >>> >>> PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_SHIFT is appropriate instead of >>> using '3'. > > good point :-) > >>>> + if (status < 0) { >>>> + dev_err(&pdev->dev, "can't remux GPIO1\n"); >>>> + return status; >>>> + } >>>> + >>>> + palmas_usb->vbus_irq = irq; >>>> + } else { >>>> + irq = regmap_irq_get_virq(palmas->irq_data, >>>> + PALMAS_VBUS_IRQ); >>>> + palmas_usb->vbus_irq = 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); >>>> status = devm_request_threaded_irq(palmas_usb->dev, >>>> palmas_usb->vbus_irq, NULL, >>>> palmas_vbus_irq_handler, >>>> >>> >>> Thanks, >>> Chanwoo Choi >>> -- >>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >>> the body of a message to majordomo at vger.kernel.org >>> More majordomo info at http://vger.kernel.org/majordomo-info.html >>> Please read the FAQ at http://www.tux.org/lkml/ >>> >> >> If you are OK about following patch, I'll apply it on extcon branch. > > that's perfect, thanks for fixing it :-) > Before applying this patch, I think that there are more generic method? So, I check the extcon-palmas.c driver again. There is similiar case for id detection. In some case, id detection use whether 'enable_id_detection' with own interrupt or 'enable_gpio_id_dectection' with specific h/w gpio like this case of vbus. In result, I implement the following patch for vbus gpio detection. But, I'm not sure because I have not any H/W board for test. If you possible, could you test it with following patch? Thanks, Chanwoo Choi diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index 93c30a8..885ee95 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -216,11 +216,23 @@ static int palmas_usb_probe(struct platform_device *pdev) return PTR_ERR(palmas_usb->id_gpiod); } + palmas_usb->vbus_gpiod = devm_gpiod_get_optional(&pdev->dev, "vbus", + GPIOD_IN); + if (IS_ERR(palmas_usb->vbus_gpiod)) { + dev_err(&pdev->dev, "failed to get vbus gpio\n"); + return PTR_ERR(palmas_usb->vbus_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_vbus_detection && palmas_usb->vbus_gpiod) { + palmas_usb->enable_vbus_detection = false; + palmas_usb->enable_gpio_vbus_detection = true; + } + if (palmas_usb->enable_gpio_id_detection) { u32 debounce; @@ -311,6 +323,40 @@ static int palmas_usb_probe(struct platform_device *pdev) palmas_usb->vbus_irq, status); return status; } + } else if (palmas_usb->enable_gpio_vbus_detection) { + /* remux GPIO_1 as VBUSDET */ + status = palmas_update_bits(palmas, + PALMAS_PU_PD_OD_BASE, + PALMAS_PRIMARY_SECONDARY_PAD1, + PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_MASK, + (1 << PALMAS_PRIMARY_SECONDARY_PAD1_GPIO_1_SHIFT)); + if (status < 0) { + dev_err(&pdev->dev, "can't remux GPIO1\n"); + return status; + } + + palmas_usb->vbus_otg_irq = regmap_irq_get_virq(palmas->irq_data, + PALMAS_VBUS_OTG_IRQ); + palmas_usb->gpio_vbus_irq = gpiod_to_irq(palmas_usb->vbus_gpiod); + if (palmas_usb->gpio_vbus_irq < 0) { + dev_err(&pdev->dev, "failed to get vbus irq\n"); + return palmas_usb->gpio_vbus_irq; + } + status = devm_request_threaded_irq(&pdev->dev, + palmas_usb->gpio_vbus_irq, + NULL, + palmas_vbus_irq_handler, + IRQF_TRIGGER_FALLING | + IRQF_TRIGGER_RISING | + IRQF_ONESHOT | + IRQF_EARLY_RESUME, + "palmas_usb_vbus", + palmas_usb); + if (status < 0) { + dev_err(&pdev->dev, + "failed to request handler for vbus irq\n"); + return status; + } } palmas_enable_irq(palmas_usb); @@ -337,6 +383,8 @@ static int palmas_usb_suspend(struct device *dev) if (device_may_wakeup(dev)) { if (palmas_usb->enable_vbus_detection) enable_irq_wake(palmas_usb->vbus_irq); + if (palmas_usb->enable_gpio_vbus_detection) + enable_irq_wake(palmas_usb->gpio_vbus_irq); if (palmas_usb->enable_id_detection) enable_irq_wake(palmas_usb->id_irq); if (palmas_usb->enable_gpio_id_detection) @@ -352,6 +400,8 @@ static int palmas_usb_resume(struct device *dev) if (device_may_wakeup(dev)) { if (palmas_usb->enable_vbus_detection) disable_irq_wake(palmas_usb->vbus_irq); + if (palmas_usb->enable_gpio_vbus_detection) + disable_irq_wake(palmas_usb->gpio_vbus_irq); if (palmas_usb->enable_id_detection) disable_irq_wake(palmas_usb->id_irq); if (palmas_usb->enable_gpio_id_detection) diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 13e1d96..7b2526f 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -553,7 +553,9 @@ struct palmas_usb { int vbus_irq; int gpio_id_irq; + int gpio_vbus_irq; struct gpio_desc *id_gpiod; + struct gpio_desc *vbus_gpiod; unsigned long sw_debounce_jiffies; struct delayed_work wq_detectid; @@ -562,6 +564,7 @@ struct palmas_usb { bool enable_vbus_detection; bool enable_id_detection; bool enable_gpio_id_detection; + bool enable_gpio_vbus_detection; }; #define comparator_to_palmas(x) container_of((x), struct palmas_usb, comparator)
next prev parent reply other threads:[~2015-11-20 16:34 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-12 17:52 [PATCH 0/2] arm: beaglex15: fix USB Gadget Felipe Balbi 2015-11-12 17:52 ` Felipe Balbi 2015-11-12 17:52 ` Felipe Balbi 2015-11-12 17:53 ` [PATCH 1/2] arm: boot: dts: beaglex15: Remove ID GPIO Felipe Balbi 2015-11-12 17:53 ` Felipe Balbi 2015-11-12 17:53 ` Felipe Balbi 2015-11-12 17:53 ` [PATCH 2/2] arm: boot: beaglex15: pass correct interrupt Felipe Balbi 2015-11-12 17:53 ` Felipe Balbi 2015-11-12 17:53 ` Felipe Balbi 2015-11-20 5:39 ` Chanwoo Choi 2015-11-20 5:39 ` Chanwoo Choi 2015-11-20 5:39 ` Chanwoo Choi [not found] ` <564F4D90.4050305@gmail.com> 2015-11-20 16:55 ` Chanwoo Choi 2015-11-20 16:55 ` Chanwoo Choi 2015-11-20 16:55 ` Chanwoo Choi 2015-11-25 19:01 ` Tony Lindgren 2015-11-25 19:01 ` Tony Lindgren 2015-11-25 19:01 ` Tony Lindgren 2015-11-12 17:54 ` [PATCH 0/2] arm: beaglex15: fix USB Gadget Felipe Balbi 2015-11-12 17:54 ` Felipe Balbi 2015-11-12 17:54 ` Felipe Balbi 2015-11-12 17:57 ` [PATCH] extcon: palmas: add support for using VBUSDET output Felipe Balbi 2015-11-12 17:57 ` Felipe Balbi 2015-11-12 17:57 ` Felipe Balbi 2015-11-20 5:33 ` Chanwoo Choi 2015-11-20 5:33 ` Chanwoo Choi 2015-11-20 5:33 ` Chanwoo Choi 2015-11-20 5:44 ` Chanwoo Choi 2015-11-20 5:44 ` Chanwoo Choi 2015-11-20 5:44 ` Chanwoo Choi 2015-11-20 14:37 ` Felipe Balbi 2015-11-20 14:37 ` Felipe Balbi 2015-11-20 14:37 ` Felipe Balbi 2015-11-20 15:05 ` Chanwoo Choi 2015-11-20 15:05 ` Chanwoo Choi 2015-11-20 15:05 ` Chanwoo Choi 2015-11-20 16:37 ` Chanwoo Choi 2015-11-20 16:37 ` Chanwoo Choi 2015-11-20 16:37 ` Chanwoo Choi 2015-11-20 16:34 ` Chanwoo Choi [this message] 2015-11-20 16:34 ` Chanwoo Choi 2015-11-20 16:34 ` Chanwoo Choi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=564F4B9F.7000100@gmail.com \ --to=cwchoi00@gmail.com \ --cc=balbi@ti.com \ --cc=cw00.choi@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=myungjoo.ham@samsung.com \ --cc=robh+dt@kernel.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.