diff options
author | Chris Ruehl <chris.ruehl@gtsys.com.hk> | 2014-01-10 00:51:29 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-13 18:55:19 -0500 |
commit | 3b5d3e6845bfe68777d069886b0d1cd5f23b9d58 (patch) | |
tree | fb5c1665e5bf14c31e497c7eed80faf1f223aca5 /drivers/usb | |
parent | 1071055e2a118a81c0b300d7f4af7eba3f7a7c82 (diff) |
usb: chipidea: Fix Internal error: : 808 [#1] ARM related to STS flag
* init the sts flag to 0 (missed)
* fix write the real bit not sts value
* Set PORTCS_STS and DEVLC_STS only if sts = 1
[Peter Chen: This one and the next patch fix the problem occurred imx27
and imx31, and imx27 and imx31 usb support are enabled until 3.14, so
these two patches isn't needed for -stable]
Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/chipidea/core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 0ead0b4a11e1..edeec3638684 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c | |||
@@ -236,7 +236,7 @@ static int hw_device_init(struct ci_hdrc *ci, void __iomem *base) | |||
236 | 236 | ||
237 | static void hw_phymode_configure(struct ci_hdrc *ci) | 237 | static void hw_phymode_configure(struct ci_hdrc *ci) |
238 | { | 238 | { |
239 | u32 portsc, lpm, sts; | 239 | u32 portsc, lpm, sts = 0; |
240 | 240 | ||
241 | switch (ci->platdata->phy_mode) { | 241 | switch (ci->platdata->phy_mode) { |
242 | case USBPHY_INTERFACE_MODE_UTMI: | 242 | case USBPHY_INTERFACE_MODE_UTMI: |
@@ -266,10 +266,12 @@ static void hw_phymode_configure(struct ci_hdrc *ci) | |||
266 | 266 | ||
267 | if (ci->hw_bank.lpm) { | 267 | if (ci->hw_bank.lpm) { |
268 | hw_write(ci, OP_DEVLC, DEVLC_PTS(7) | DEVLC_PTW, lpm); | 268 | hw_write(ci, OP_DEVLC, DEVLC_PTS(7) | DEVLC_PTW, lpm); |
269 | hw_write(ci, OP_DEVLC, DEVLC_STS, sts); | 269 | if (sts) |
270 | hw_write(ci, OP_DEVLC, DEVLC_STS, DEVLC_STS); | ||
270 | } else { | 271 | } else { |
271 | hw_write(ci, OP_PORTSC, PORTSC_PTS(7) | PORTSC_PTW, portsc); | 272 | hw_write(ci, OP_PORTSC, PORTSC_PTS(7) | PORTSC_PTW, portsc); |
272 | hw_write(ci, OP_PORTSC, PORTSC_STS, sts); | 273 | if (sts) |
274 | hw_write(ci, OP_PORTSC, PORTSC_STS, PORTSC_STS); | ||
273 | } | 275 | } |
274 | } | 276 | } |
275 | 277 | ||