summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSakethram Bommisetti <sakethram.bommisetti@stericsson.com>2011-09-16 17:49:27 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:03:08 +0200
commit112b4b841e6c902870daccbde4080b2ed3a12888 (patch)
treea1299c8499dd2c7c1364f2bc5e4eb2fa2f24c772
parentc4947d9f3516df71e776ff25531472e737eba3c0 (diff)
u8500: USB: Remove max current constraint for abv3
In case of connection to standard host, maximum allowed current is freely set as part of enumeration. Maximum current limitation is retained only for ab versions below 3.0. ST-Ericsson ID: 343538 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> Signed-off-by: dushyanth.sr <dushyanth.sr@stericsson.com> Change-Id: Ia3375ce167bec1b4321e69e42f107b0550e98053 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31268 Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com>
-rw-r--r--drivers/usb/otg/ab8500-usb.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/usb/otg/ab8500-usb.c b/drivers/usb/otg/ab8500-usb.c
index a47bce1d776..657c0834240 100644
--- a/drivers/usb/otg/ab8500-usb.c
+++ b/drivers/usb/otg/ab8500-usb.c
@@ -407,16 +407,13 @@ static void ab8500_usb_phy_disable_work(struct work_struct *work)
static unsigned ab8500_eyediagram_workaroud(struct ab8500_usb *ab, unsigned mA)
{
- if (mA > 100) {
- /* AB V2 has eye diagram issues when drawing more
- * than 100mA from VBUS.So setting charging current
- * to 100mA in case of standard host
- */
- if (ab->rev < 0x30)
- mA = 100;
- else
- mA = 300;
- }
+ /* AB V2 has eye diagram issues when drawing more
+ * than 100mA from VBUS.So setting charging current
+ * to 100mA in case of standard host
+ */
+ if ((ab->rev < 0x30) && (mA > 100))
+ mA = 100;
+
return mA;
}