diff options
| author | Henry Lin <henryl@nvidia.com> | 2013-09-16 14:15:25 +0800 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2013-10-04 08:36:20 -0700 |
| commit | 728fac1d7b7d91ad32ea9ec58da35c9464eed5fd (patch) | |
| tree | 0e7b20392e7bbbdabfcf8325eb8e16f076d6bedf /arch/arm/mach-tegra/include/mach/xusb.h | |
| parent | 4d59c84dda7b8cd92755063a261057ca6143ca87 (diff) | |
xhci: tegra: only enable vbus owned by xusb
The vbus regulators are shared between xhci and echi host
controller. Only the port owner should enable corresponding
vbus regulator.
Bug 1348463
Change-Id: I77ad19505869e98ae47f1ef36956e8312b5f2e4e
Signed-off-by: Henry Lin <henryl@nvidia.com>
Reviewed-on: http://git-master/r/281337
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/xusb.h')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/xusb.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/include/mach/xusb.h b/arch/arm/mach-tegra/include/mach/xusb.h index 9466a15e5090..a87a9c5dddfb 100644 --- a/arch/arm/mach-tegra/include/mach/xusb.h +++ b/arch/arm/mach-tegra/include/mach/xusb.h @@ -27,9 +27,11 @@ */ #define TEGRA_XUSB_SS_P0 (1 << 0) #define TEGRA_XUSB_SS_P1 (1 << 1) -#define TEGRA_XUSB_USB2_P0 (1 << 8) -#define TEGRA_XUSB_USB2_P1 (1 << 9) -#define TEGRA_XUSB_USB2_P2 (1 << 10) +#define XUSB_UTMI_INDEX (8) +#define XUSB_UTMI_COUNT (3) +#define TEGRA_XUSB_USB2_P0 BIT(XUSB_UTMI_INDEX) +#define TEGRA_XUSB_USB2_P1 BIT(XUSB_UTMI_INDEX + 1) +#define TEGRA_XUSB_USB2_P2 BIT(XUSB_UTMI_INDEX + 2) #define XUSB_HSIC_INDEX (16) #define XUSB_HSIC_COUNT (2) #define XUSB_SS_PORT_COUNT (2) @@ -50,9 +52,7 @@ #define TEGRA_XUSB_UTMIP_PMC_PORT2 (0x2) struct tegra_xusb_regulator_name { - u8 *s5p0v; - u8 *s5p0v1; - u8 *s5p0v2; + const char *utmi_vbuses[XUSB_UTMI_COUNT]; u8 *s3p3v; u8 *s1p8v; const char *vddio_hsic; @@ -80,7 +80,6 @@ struct tegra_xusb_board_data { u8 ss_portmap; u8 ulpicap; u8 lane_owner; - bool uses_different_vbus_per_port; bool uses_external_pmic; bool gpio_controls_muxed_ss_lanes; u32 gpio_ss1_sata; |