Re: [PATCH 3/3] usb: dwc3: use extcon fwrk to receive connect/disconnect notification
On 05/24/2013 11:31 PM, Kishon Vijay Abraham I wrote:
Modified dwc3-omap to receive connect and disconnect notification using
extcon framework. Also did the necessary cleanups required after
adapting to extcon framework.
Signed-off-by: Kishon Vijay Abraham I kis...@ti.com
---
drivers/usb/dwc3/dwc3-omap.c | 80
+--
include/linux/usb/dwc3-omap.h | 30
2 files changed, 62 insertions(+), 48 deletions(-)
delete mode 100644 include/linux/usb/dwc3-omap.h
Hi Kishon,
Thi patch is suspended until fix following build error.
(If kernel builds extcon fwr as module, dwc3-omap.c happen error message)
---
tree: git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon extcon-next
head: 30f5d6ea2561c2a54e40b1e8e8f9bb30e064e01b
commit: 30f5d6ea2561c2a54e40b1e8e8f9bb30e064e01b [3/3] usb: dwc3: use extcon
fwrk to receive connect/disconnect notification
config: i386-randconfig-x14-0530 (attached as .config)
All error/warnings:
drivers/built-in.o: In function `dwc3_omap_remove':
dwc3-omap.c:(.text+0x8c0fa): undefined reference to
`extcon_unregister_interest'
dwc3-omap.c:(.text+0x8c102): undefined reference to
`extcon_unregister_interest'
drivers/built-in.o: In function `dwc3_omap_probe':
dwc3-omap.c:(.text+0x8c5e6): undefined reference to `extcon_get_extcon_dev'
dwc3-omap.c:(.text+0x8c6a4): undefined reference to
`extcon_register_interest'
dwc3-omap.c:(.text+0x8c6c9): undefined reference to
`extcon_register_interest'
dwc3-omap.c:(.text+0x8c831): undefined reference to `extcon_get_cable_state'
dwc3-omap.c:(.text+0x8c851): undefined reference to `extcon_get_cable_state'
---
Also, I missed a issue of this patch. If h/w target use other USB device
instead of palmas-usb, dwc-omap.c driver won't be operating.
So, I propose two method about this issue.
First, we can get extcon device name through platform data or dt.
Two, When use extcon_register_interest() to register notifier block,
NULL pointer pass to extcon_register_interest() instead of specific extcon
device name(palmas-usb). If extcon_register_interest() check NULL
pointer of extcon device name parameter, extcon fwr will find previous
registered extcon device and then register notifier block of consumer
device driver(dwc3-omap.c) to previous registered extcon device.
+ edev = extcon_get_extcon_dev(palmas-usb);
+ if (!edev) {
+ dev_dbg(dev, couldn't get extcon device\n);
+ return -EPROBE_DEFER;
+ }
+
spin_lock_init(omap-lock);
omap-dev = dev;
omap-irq = irq;
omap-base = base;
+ omap-vbus_nb.notifier_call = dwc3_omap_vbus_notifier;
+ extcon_register_interest(omap-extcon_vbus_dev, palmas-usb, USB,
+ omap-vbus_nb);
+ omap-id_nb.notifier_call = dwc3_omap_id_notifier;
+ extcon_register_interest(omap-extcon_id_dev, palmas-usb, USB-HOST,
+ omap-id_nb);
dev-dma_mask = dwc3_omap_dma_mask;
+
Thanks,
Chanwoo Choi
--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/3] usb: dwc3: use extcon fwrk to receive connect/disconnect notification
On 05/24/2013 11:31 PM, Kishon Vijay Abraham I wrote: Modified dwc3-omap to receive connect and disconnect notification using extcon framework. Also did the necessary cleanups required after adapting to extcon framework. Signed-off-by: Kishon Vijay Abraham I kis...@ti.com --- drivers/usb/dwc3/dwc3-omap.c | 80 +-- include/linux/usb/dwc3-omap.h | 30 2 files changed, 62 insertions(+), 48 deletions(-) delete mode 100644 include/linux/usb/dwc3-omap.h I check the code about extcon framework. Acked-by: Chanwoo Choi cw00.c...@samsung.com Thanks, Chanwoo Choi -- To unsubscribe from this list: send the line unsubscribe linux-usb in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] usb: dwc3: use extcon fwrk to receive connect/disconnect notification
Modified dwc3-omap to receive connect and disconnect notification using
extcon framework. Also did the necessary cleanups required after
adapting to extcon framework.
Signed-off-by: Kishon Vijay Abraham I kis...@ti.com
---
drivers/usb/dwc3/dwc3-omap.c | 80 +--
include/linux/usb/dwc3-omap.h | 30
2 files changed, 62 insertions(+), 48 deletions(-)
delete mode 100644 include/linux/usb/dwc3-omap.h
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 34638b9..771f936 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -43,13 +43,13 @@
#include linux/spinlock.h
#include linux/platform_device.h
#include linux/platform_data/dwc3-omap.h
-#include linux/usb/dwc3-omap.h
#include linux/pm_runtime.h
#include linux/dma-mapping.h
#include linux/ioport.h
#include linux/io.h
#include linux/of.h
#include linux/of_platform.h
+#include linux/extcon.h
#include linux/usb/otg.h
@@ -124,9 +124,19 @@ struct dwc3_omap {
u32 utmi_otg_status;
u32 dma_status:1;
+
+ struct extcon_specific_cable_nb extcon_vbus_dev;
+ struct extcon_specific_cable_nb extcon_id_dev;
+ struct notifier_block vbus_nb;
+ struct notifier_block id_nb;
};
-static struct dwc3_omap*_omap;
+enum omap_dwc3_vbus_id_status {
+ OMAP_DWC3_ID_FLOAT,
+ OMAP_DWC3_ID_GROUND,
+ OMAP_DWC3_VBUS_OFF,
+ OMAP_DWC3_VBUS_VALID,
+};
static inline u32 dwc3_omap_readl(void __iomem *base, u32 offset)
{
@@ -138,13 +148,10 @@ static inline void dwc3_omap_writel(void __iomem *base,
u32 offset, u32 value)
writel(value, base + offset);
}
-int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
+static void dwc3_omap_set_mailbox(struct dwc3_omap *omap,
+ enum omap_dwc3_vbus_id_status status)
{
- u32 val;
- struct dwc3_omap*omap = _omap;
-
- if (!omap)
- return -EPROBE_DEFER;
+ u32 val;
switch (status) {
case OMAP_DWC3_ID_GROUND:
@@ -185,12 +192,9 @@ int dwc3_omap_mailbox(enum omap_dwc3_vbus_id_status status)
break;
default:
- dev_dbg(omap-dev, ID float\n);
+ dev_dbg(omap-dev, invalid state\n);
}
-
- return 0;
}
-EXPORT_SYMBOL_GPL(dwc3_omap_mailbox);
static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap)
{
@@ -282,6 +286,32 @@ static void dwc3_omap_disable_irqs(struct dwc3_omap *omap)
static u64 dwc3_omap_dma_mask = DMA_BIT_MASK(32);
+static int dwc3_omap_id_notifier(struct notifier_block *nb,
+ unsigned long event, void *ptr)
+{
+ struct dwc3_omap *omap = container_of(nb, struct dwc3_omap, id_nb);
+
+ if (event)
+ dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_GROUND);
+ else
+ dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_FLOAT);
+
+ return NOTIFY_DONE;
+}
+
+static int dwc3_omap_vbus_notifier(struct notifier_block *nb,
+ unsigned long event, void *ptr)
+{
+ struct dwc3_omap *omap = container_of(nb, struct dwc3_omap, vbus_nb);
+
+ if (event)
+ dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_VALID);
+ else
+ dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_OFF);
+
+ return NOTIFY_DONE;
+}
+
static int dwc3_omap_probe(struct platform_device *pdev)
{
struct device_node *node = pdev-dev.of_node;
@@ -289,6 +319,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
struct dwc3_omap*omap;
struct resource *res;
struct device *dev = pdev-dev;
+ struct extcon_dev *edev;
int ret = -ENOMEM;
int irq;
@@ -330,19 +361,25 @@ static int dwc3_omap_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ edev = extcon_get_extcon_dev(palmas-usb);
+ if (!edev) {
+ dev_dbg(dev, couldn't get extcon device\n);
+ return -EPROBE_DEFER;
+ }
+
spin_lock_init(omap-lock);
omap-dev = dev;
omap-irq = irq;
omap-base = base;
+ omap-vbus_nb.notifier_call = dwc3_omap_vbus_notifier;
+ extcon_register_interest(omap-extcon_vbus_dev, palmas-usb, USB,
+ omap-vbus_nb);
+ omap-id_nb.notifier_call = dwc3_omap_id_notifier;
+ extcon_register_interest(omap-extcon_id_dev, palmas-usb, USB-HOST,
+ omap-id_nb);
dev-dma_mask = dwc3_omap_dma_mask;
- /*
-* REVISIT if we ever have two instances of the wrapper, we will be
-* in big trouble
-*/
- _omap = omap;
-
pm_runtime_enable(dev);
ret = pm_runtime_get_sync(dev);
if (ret 0) {
@@ -387,6 +424,11 @@ static int dwc3_omap_probe(struct platform_device *pdev)
