aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2010-07-19 10:01:41 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 17:35:43 -0400
commit1eb838d3e2a473acbb9b21278e75b79640fb2c7b (patch)
treec702eb55341116e5c48518bbabc373cc82e92a71 /drivers/usb
parent4d47166c975382f5e95086e8a88d4a39d27b34b5 (diff)
USB: s3c-hsotg: modify only selected bits in S3C_PHYPWR register
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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/s3c-hsotg.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index ce272b4d79c4..258ca01ac679 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -2801,9 +2801,11 @@ static void __devinit s3c_hsotg_initep(struct s3c_hsotg *hsotg,
2801static void s3c_hsotg_otgreset(struct s3c_hsotg *hsotg) 2801static void s3c_hsotg_otgreset(struct s3c_hsotg *hsotg)
2802{ 2802{
2803 struct clk *xusbxti; 2803 struct clk *xusbxti;
2804 u32 osc; 2804 u32 pwr, osc;
2805 2805
2806 writel(0, S3C_PHYPWR); 2806 pwr = readl(S3C_PHYPWR);
2807 pwr &= ~0x19;
2808 writel(pwr, S3C_PHYPWR);
2807 mdelay(1); 2809 mdelay(1);
2808 2810
2809 osc = hsotg->plat->is_osc ? S3C_PHYCLK_EXT_OSC : 0; 2811 osc = hsotg->plat->is_osc ? S3C_PHYCLK_EXT_OSC : 0;