diff options
author | Hyongbin Kim <hyongbink@nvidia.com> | 2013-06-20 20:07:34 +0900 |
---|---|---|
committer | Gabby Lee <galee@nvidia.com> | 2013-06-20 19:40:31 -0700 |
commit | 930109e1ec09f4de809c692faceb7a8282bc66a1 (patch) | |
tree | 0e1b60f32738da465c2d58034c88325ee748a417 /arch | |
parent | c7efada29f95774c22271229142a3a92bbed6d23 (diff) |
ARM: mach-tegra: usb_phy: WAR: Apple compatibility charger detect as NVcharger.
NVcharger detection logic is defferent between BL and kernel.
Tegratab not use NVcharger, but apple chargers are detect as
NVcharger in BL and kernel can't detect apple compatibility
charger except iPad/iPhone5 charger.
It is better those are detected as NVcharger.
Tegratab charger IC support DPM(synamic Power Management) mode to
avoid over loading the adapter.
Bug 1308440
Bug 1299342
Change-Id: Idd36aee98c65350ca61b5237a25f9ac5ef81af2e
Signed-off-by: Hyongbin Kim <hyongbink@nvidia.com>
Reviewed-on: http://git-master/r/240581
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Gabby Lee <galee@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/tegra11x_usb_phy.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/mach-tegra/tegra11x_usb_phy.c b/arch/arm/mach-tegra/tegra11x_usb_phy.c index b12867e31b3a..6c9454be9739 100644 --- a/arch/arm/mach-tegra/tegra11x_usb_phy.c +++ b/arch/arm/mach-tegra/tegra11x_usb_phy.c @@ -1525,8 +1525,6 @@ static void utmi_phy_pmc_disable(struct tegra_usb_phy *phy) } static bool utmi_phy_nv_charger_detect(struct tegra_usb_phy *phy) { - int status1; - int status2; int status3; bool ret; @@ -1536,24 +1534,13 @@ static bool utmi_phy_nv_charger_detect(struct tegra_usb_phy *phy) return false; ret = false; - /* Turn off all terminations except DP pulldown */ - status1 = utmi_phy_get_dp_dm_status(phy, - DISABLE_PULLUP_DP | DISABLE_PULLUP_DM | - FORCE_PULLDN_DP | DISABLE_PULLDN_DM); - - /* Turn off all terminations except for DP pullup */ - status2 = utmi_phy_get_dp_dm_status(phy, - FORCE_PULLUP_DP | DISABLE_PULLUP_DM | - DISABLE_PULLDN_DP | DISABLE_PULLDN_DM); /* Check for NV charger DISABLE all terminations */ status3 = utmi_phy_get_dp_dm_status(phy, DISABLE_PULLUP_DP | DISABLE_PULLUP_DM | DISABLE_PULLDN_DP | DISABLE_PULLDN_DM); - if ((status1 == (USB_PORTSC_LINE_DP_SET | USB_PORTSC_LINE_DM_SET)) && - (status2 == (USB_PORTSC_LINE_DP_SET | USB_PORTSC_LINE_DM_SET)) && - (status3 == (USB_PORTSC_LINE_DP_SET | USB_PORTSC_LINE_DM_SET))) + if (status3 == (USB_PORTSC_LINE_DP_SET | USB_PORTSC_LINE_DM_SET)) ret = true; /* Restore standard termination by hardware. */ |