]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
USB: s3c-hsotg: modify only selected bits in S3C_PHYPWR register
authorMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 19 Jul 2010 14:01:41 +0000 (16:01 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 Aug 2010 21:35:43 +0000 (14:35 -0700)
S5PV210 SoCs has 2 USB PHY interfaces, both enabled by writing zero to
S3C_PHYPWR register. HS/OTG driver uses only PHY0, so do not touch bits
related to PHY1.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/gadget/s3c-hsotg.c

index ce272b4d79c4ae3bcca4dd88cefa2b57fed47247..258ca01ac67941f7bbd6bc8f49165ce54a562c98 100644 (file)
@@ -2801,9 +2801,11 @@ static void __devinit s3c_hsotg_initep(struct s3c_hsotg *hsotg,
 static void s3c_hsotg_otgreset(struct s3c_hsotg *hsotg)
 {
        struct clk *xusbxti;
-       u32 osc;
+       u32 pwr, osc;
 
-       writel(0, S3C_PHYPWR);
+       pwr = readl(S3C_PHYPWR);
+       pwr &= ~0x19;
+       writel(pwr, S3C_PHYPWR);
        mdelay(1);
 
        osc = hsotg->plat->is_osc ? S3C_PHYCLK_EXT_OSC : 0;