summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Majewski <l.majewski@samsung.com>2012-05-04 14:17:06 +0200
committerFelipe Balbi <balbi@ti.com>2012-05-04 15:53:13 +0300
commitb3546c97c7bb89294fc3da2718b3fabe7ee4c579 (patch)
tree236121b7801ae4e02637c5ecb25c7183b4b82ba0
parent308d734e9ed86b6713da46b4b9ce9ff017e75c63 (diff)
downloadop-kernel-dev-b3546c97c7bb89294fc3da2718b3fabe7ee4c579.zip
op-kernel-dev-b3546c97c7bb89294fc3da2718b3fabe7ee4c579.tar.gz
usb:hsotg:samsung: Remove Disconnect Interrupt handler
The USB Disconnect Interrupt handler, according to specification, is only working at HOST mode. Samsung SoCs (e.g. Exynos4) are working at device mode, so this interrupt is never caught. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/s3c-hsotg.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 8d86528..d0e4fb3 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -2211,12 +2211,11 @@ static void s3c_hsotg_core_init(struct s3c_hsotg *hsotg)
/* Clear any pending interrupts */
writel(0xffffffff, hsotg->regs + S3C_GINTSTS);
- writel(S3C_GINTSTS_DisconnInt | S3C_GINTSTS_SessReqInt |
+ writel(S3C_GINTSTS_ErlySusp | S3C_GINTSTS_SessReqInt |
S3C_GINTSTS_GOUTNakEff | S3C_GINTSTS_GINNakEff |
S3C_GINTSTS_ConIDStsChng | S3C_GINTSTS_USBRst |
S3C_GINTSTS_EnumDone | S3C_GINTSTS_OTGInt |
- S3C_GINTSTS_USBSusp | S3C_GINTSTS_WkUpInt |
- S3C_GINTSTS_ErlySusp,
+ S3C_GINTSTS_USBSusp | S3C_GINTSTS_WkUpInt,
hsotg->regs + S3C_GINTMSK);
if (using_dma(hsotg))
@@ -2339,13 +2338,6 @@ irq_retry:
writel(otgint, hsotg->regs + S3C_GOTGINT);
}
- if (gintsts & S3C_GINTSTS_DisconnInt) {
- dev_dbg(hsotg->dev, "%s: DisconnInt\n", __func__);
- writel(S3C_GINTSTS_DisconnInt, hsotg->regs + S3C_GINTSTS);
-
- s3c_hsotg_disconnect_irq(hsotg);
- }
-
if (gintsts & S3C_GINTSTS_SessReqInt) {
dev_dbg(hsotg->dev, "%s: SessReqInt\n", __func__);
writel(S3C_GINTSTS_SessReqInt, hsotg->regs + S3C_GINTSTS);
OpenPOWER on IntegriCloud