Merge "msm_hsusb: Vote for corner of VDD CX instead of voltage of VDD CX" into msm-3.0

This commit is contained in:
Linux Build Service Account
2012-04-25 15:37:35 -07:00
committed by QuIC Gerrit Code Review
3 changed files with 64 additions and 62 deletions

View File

@@ -148,6 +148,17 @@ enum usb_chg_type {
USB_ACA_DOCK_CHARGER,
};
/**
* Used different VDDCX voltage voting mechnism
* VDDCX_CORNER Vote for VDDCX Corner voltage
* VDDCX Vote for VDDCX Absolute voltage
*/
enum usb_vdd_type {
VDDCX_CORNER = 0,
VDDCX,
VDD_TYPE_MAX,
};
/**
* SPS Pipes direction.
*
@@ -342,6 +353,7 @@ struct msm_otg {
unsigned long tmouts;
u8 active_tmout;
struct hrtimer timer;
enum usb_vdd_type vdd_type;
};
struct msm_hsic_host_platform_data {