diff options
author | Thomas Abraham <thomas.ab@samsung.com> | 2010-05-24 04:48:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-04 16:16:19 -0400 |
commit | 390b166138e95a47bdfde6582a1935f65e5c6547 (patch) | |
tree | 34afb0c75ae5b2175c1b4a097ad10bea9c43bace /drivers/usb | |
parent | 0238634d02dd10b678ebe9ea5d8803483277ee93 (diff) |
USB: s3c: Enable soft disconnect during initialization
Enable soft disconnect bit the OTG core during initialization. Without this,
the host sees that a gadget is connected and tries to enumerate. The
soft disconnect should be enabled until the USB gadget driver is
registered with this otg driver.
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/s3c-hsotg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 1f73b485732d..a6d725dd7335 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c | |||
@@ -2730,6 +2730,9 @@ static void s3c_hsotg_init(struct s3c_hsotg *hsotg) | |||
2730 | 2730 | ||
2731 | writel(0, hsotg->regs + S3C_DAINTMSK); | 2731 | writel(0, hsotg->regs + S3C_DAINTMSK); |
2732 | 2732 | ||
2733 | /* Be in disconnected state until gadget is registered */ | ||
2734 | __orr32(hsotg->regs + S3C_DCTL, S3C_DCTL_SftDiscon); | ||
2735 | |||
2733 | if (0) { | 2736 | if (0) { |
2734 | /* post global nak until we're ready */ | 2737 | /* post global nak until we're ready */ |
2735 | writel(S3C_DCTL_SGNPInNAK | S3C_DCTL_SGOUTNak, | 2738 | writel(S3C_DCTL_SGNPInNAK | S3C_DCTL_SGOUTNak, |