DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "USB: OTG: msm: Disable PMIC ID pullup before enabling ACA ID detection" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2012-02-12 23:09:40 -08:00
committed by QuIC Gerrit Code Review
parent 625684a912 446f45463f
commit 0972cb9c1d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/otg/msm_otg.c
View File

@@ -37,6 +37,7 @@
#include <linux/usb/msm_hsusb_hw.h> #include <linux/usb/msm_hsusb_hw.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/mfd/pm8xxx/pm8921-charger.h> #include <linux/mfd/pm8xxx/pm8921-charger.h>
#include <linux/mfd/pm8xxx/misc.h>
#include <linux/pm_qos_params.h> #include <linux/pm_qos_params.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
@@ -571,6 +572,9 @@ static int msm_otg_reset(struct otg_transceiver *otg)
writel_relaxed(val, USB_OTGSC); writel_relaxed(val, USB_OTGSC);
ulpi_write(otg, ulpi_val, ULPI_USB_INT_EN_RISE); ulpi_write(otg, ulpi_val, ULPI_USB_INT_EN_RISE);
ulpi_write(otg, ulpi_val, ULPI_USB_INT_EN_FALL); ulpi_write(otg, ulpi_val, ULPI_USB_INT_EN_FALL);
} else if (pdata->otg_control == OTG_PMIC_CONTROL) {
/* Enable PMIC pull-up */
pm8xxx_usb_id_pullup(1);
} }
return 0; return 0;
@@ -1307,6 +1311,8 @@ static void msm_chg_enable_aca_det(struct msm_otg *motg)
ulpi_write(otg, 0x01, 0x0C); ulpi_write(otg, 0x01, 0x0C);
ulpi_write(otg, 0x10, 0x0F); ulpi_write(otg, 0x10, 0x0F);
ulpi_write(otg, 0x10, 0x12); ulpi_write(otg, 0x10, 0x12);
/* Disable PMIC ID pull-up */
pm8xxx_usb_id_pullup(0);
/* Enable ACA ID detection */ /* Enable ACA ID detection */
ulpi_write(otg, 0x20, 0x85); ulpi_write(otg, 0x20, 0x85);
aca_id_turned_on = true; aca_id_turned_on = true;