From: Krzysztof Kozlowski <k.kozlowski@samsung.com> To: MyungJoo Ham <myungjoo.ham@samsung.com>, Chanwoo Choi <cw00.choi@samsung.com>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <k.kozlowski@samsung.com>, Marek Szyprowski <m.szyprowski@samsung.com>, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: rogerq@ti.com, Peter Chen <peter.chen@freescale.com>, "Ivan T. Ivanov" <iivanov@mm-sol.com>, balbi@ti.com, kishon@ti.com, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Subject: [RFC v4 2/7] Revert "extcon: usb-gpio: switch to use pm wakeirq apis" Date: Wed, 08 Jun 2016 15:48:01 +0200 [thread overview] Message-ID: <1465393686-16644-3-git-send-email-k.kozlowski@samsung.com> (raw) In-Reply-To: <1465393686-16644-1-git-send-email-k.kozlowski@samsung.com> This reverts commit 8106e404174253639731cc30a44f5b3ab764c5b7. When using PM wakeirq API only one wakeup IRQ can be set. However the driver will support also VBUS GPIO so we need two wakeup interrupts. --- drivers/extcon/extcon-usb-gpio.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c index 2512660dc4b9..a36aab007022 100644 --- a/drivers/extcon/extcon-usb-gpio.c +++ b/drivers/extcon/extcon-usb-gpio.c @@ -24,7 +24,6 @@ #include <linux/module.h> #include <linux/of_gpio.h> #include <linux/platform_device.h> -#include <linux/pm_wakeirq.h> #include <linux/slab.h> #include <linux/workqueue.h> #include <linux/acpi.h> @@ -143,8 +142,7 @@ static int usb_extcon_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, info); - device_init_wakeup(dev, true); - dev_pm_set_wake_irq(dev, info->id_irq); + device_init_wakeup(dev, 1); /* Perform initial detection */ usb_extcon_detect_cable(&info->wq_detcable.work); @@ -158,9 +156,6 @@ static int usb_extcon_remove(struct platform_device *pdev) cancel_delayed_work_sync(&info->wq_detcable); - dev_pm_clear_wake_irq(&pdev->dev); - device_init_wakeup(&pdev->dev, false); - return 0; } @@ -170,6 +165,12 @@ static int usb_extcon_suspend(struct device *dev) struct usb_extcon_info *info = dev_get_drvdata(dev); int ret = 0; + if (device_may_wakeup(dev)) { + ret = enable_irq_wake(info->id_irq); + if (ret) + return ret; + } + /* * We don't want to process any IRQs after this point * as GPIOs used behind I2C subsystem might not be @@ -185,6 +186,12 @@ static int usb_extcon_resume(struct device *dev) struct usb_extcon_info *info = dev_get_drvdata(dev); int ret = 0; + if (device_may_wakeup(dev)) { + ret = disable_irq_wake(info->id_irq); + if (ret) + return ret; + } + enable_irq(info->id_irq); if (!device_may_wakeup(dev)) queue_delayed_work(system_power_efficient_wq, -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: k.kozlowski@samsung.com (Krzysztof Kozlowski) To: linux-arm-kernel@lists.infradead.org Subject: [RFC v4 2/7] Revert "extcon: usb-gpio: switch to use pm wakeirq apis" Date: Wed, 08 Jun 2016 15:48:01 +0200 [thread overview] Message-ID: <1465393686-16644-3-git-send-email-k.kozlowski@samsung.com> (raw) In-Reply-To: <1465393686-16644-1-git-send-email-k.kozlowski@samsung.com> This reverts commit 8106e404174253639731cc30a44f5b3ab764c5b7. When using PM wakeirq API only one wakeup IRQ can be set. However the driver will support also VBUS GPIO so we need two wakeup interrupts. --- drivers/extcon/extcon-usb-gpio.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c index 2512660dc4b9..a36aab007022 100644 --- a/drivers/extcon/extcon-usb-gpio.c +++ b/drivers/extcon/extcon-usb-gpio.c @@ -24,7 +24,6 @@ #include <linux/module.h> #include <linux/of_gpio.h> #include <linux/platform_device.h> -#include <linux/pm_wakeirq.h> #include <linux/slab.h> #include <linux/workqueue.h> #include <linux/acpi.h> @@ -143,8 +142,7 @@ static int usb_extcon_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, info); - device_init_wakeup(dev, true); - dev_pm_set_wake_irq(dev, info->id_irq); + device_init_wakeup(dev, 1); /* Perform initial detection */ usb_extcon_detect_cable(&info->wq_detcable.work); @@ -158,9 +156,6 @@ static int usb_extcon_remove(struct platform_device *pdev) cancel_delayed_work_sync(&info->wq_detcable); - dev_pm_clear_wake_irq(&pdev->dev); - device_init_wakeup(&pdev->dev, false); - return 0; } @@ -170,6 +165,12 @@ static int usb_extcon_suspend(struct device *dev) struct usb_extcon_info *info = dev_get_drvdata(dev); int ret = 0; + if (device_may_wakeup(dev)) { + ret = enable_irq_wake(info->id_irq); + if (ret) + return ret; + } + /* * We don't want to process any IRQs after this point * as GPIOs used behind I2C subsystem might not be @@ -185,6 +186,12 @@ static int usb_extcon_resume(struct device *dev) struct usb_extcon_info *info = dev_get_drvdata(dev); int ret = 0; + if (device_may_wakeup(dev)) { + ret = disable_irq_wake(info->id_irq); + if (ret) + return ret; + } + enable_irq(info->id_irq); if (!device_may_wakeup(dev)) queue_delayed_work(system_power_efficient_wq, -- 1.9.1
next prev parent reply other threads:[~2016-06-08 13:49 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20160608134820epcas1p4ee75a89888f2ae2adb733124a330bd2c@epcas1p4.samsung.com> 2016-06-08 13:47 ` [RFC v4 0/7] extcon: usb-gpio: fixes and improvements Krzysztof Kozlowski 2016-06-08 13:47 ` Krzysztof Kozlowski 2016-06-08 13:48 ` [RFC v4 1/7] Documentation: extcon: usb-gpio: update usb-gpio binding description Krzysztof Kozlowski 2016-06-08 13:48 ` Krzysztof Kozlowski 2016-06-10 14:00 ` Rob Herring 2016-06-10 14:00 ` Rob Herring 2016-06-10 14:00 ` Rob Herring 2016-06-08 13:48 ` Krzysztof Kozlowski [this message] 2016-06-08 13:48 ` [RFC v4 2/7] Revert "extcon: usb-gpio: switch to use pm wakeirq apis" Krzysztof Kozlowski 2016-06-09 8:00 ` Roger Quadros 2016-06-09 8:00 ` Roger Quadros 2016-06-09 8:00 ` Roger Quadros 2016-06-09 8:10 ` Krzysztof Kozlowski 2016-06-09 8:10 ` Krzysztof Kozlowski 2016-06-09 8:20 ` Roger Quadros 2016-06-09 8:20 ` Roger Quadros 2016-06-09 8:20 ` Roger Quadros 2016-06-08 13:48 ` [RFC v4 3/7] extcon: Add raw VBUS and ID cable states Krzysztof Kozlowski 2016-06-08 13:48 ` Krzysztof Kozlowski 2016-06-08 13:48 ` Krzysztof Kozlowski 2016-06-08 13:48 ` [RFC v4 4/7] extcon: usb-gpio: Add support for VBUS detection Krzysztof Kozlowski 2016-06-08 13:48 ` Krzysztof Kozlowski 2016-06-08 13:48 ` Krzysztof Kozlowski 2016-06-09 8:38 ` Roger Quadros 2016-06-09 8:38 ` Roger Quadros 2016-06-09 8:38 ` Roger Quadros 2016-06-09 8:41 ` Roger Quadros 2016-06-09 8:41 ` Roger Quadros 2016-06-09 8:41 ` Roger Quadros 2016-06-09 8:43 ` Krzysztof Kozlowski 2016-06-09 8:43 ` Krzysztof Kozlowski 2016-06-09 12:13 ` Roger Quadros 2016-06-09 12:13 ` Roger Quadros 2016-06-09 12:13 ` Roger Quadros 2016-06-08 13:48 ` [RFC v4 5/7] extcon: usb-gpio: make debounce value configurable in devicetree Krzysztof Kozlowski 2016-06-08 13:48 ` Krzysztof Kozlowski 2016-06-08 13:48 ` [RFC v4 6/7] ARM: exynos_defconfig: Enable EXTCON_USB_GPIO for Odroid XU3 USB OTG Krzysztof Kozlowski 2016-06-08 13:48 ` Krzysztof Kozlowski 2016-06-08 13:48 ` [RFC v4 7/7] ARM: dts: exynos: Add extcon-usb-gpio node for Odroid XU3 Krzysztof Kozlowski 2016-06-08 13:48 ` Krzysztof Kozlowski 2016-06-09 8:35 ` [RFC v4 0/7] extcon: usb-gpio: fixes and improvements Chanwoo Choi 2016-06-09 8:35 ` Chanwoo Choi 2016-06-09 8:39 ` Krzysztof Kozlowski 2016-06-09 8:39 ` Krzysztof Kozlowski 2016-06-09 9:32 ` Chanwoo Choi 2016-06-09 9:32 ` Chanwoo Choi 2016-06-09 9:32 ` Chanwoo Choi 2016-08-01 12:23 ` Roger Quadros 2016-08-01 12:23 ` Roger Quadros 2016-08-01 12:23 ` Roger Quadros 2016-08-01 12:57 ` Chanwoo Choi 2016-08-01 12:57 ` Chanwoo Choi 2016-06-26 16:39 ` Tobias Jakobi 2016-06-26 16:39 ` Tobias Jakobi 2016-06-27 5:22 ` Krzysztof Kozlowski 2016-06-27 5:22 ` Krzysztof Kozlowski
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=1465393686-16644-3-git-send-email-k.kozlowski@samsung.com \ --to=k.kozlowski@samsung.com \ --cc=b.zolnierkie@samsung.com \ --cc=balbi@ti.com \ --cc=cw00.choi@samsung.com \ --cc=devicetree@vger.kernel.org \ --cc=iivanov@mm-sol.com \ --cc=kgene@kernel.org \ --cc=kishon@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=mark.rutland@arm.com \ --cc=myungjoo.ham@samsung.com \ --cc=peter.chen@freescale.com \ --cc=robh+dt@kernel.org \ --cc=rogerq@ti.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.