Merge commit 'main-jb-2012.08.03-B4' into t114-0806

[linux-2.6.git] / arch / arm / mach-tegra / tegra_usb_phy.h

diff --git a/arch/arm/mach-tegra/tegra_usb_phy.h b/arch/arm/mach-tegra/tegra_usb_phy.h
index 491a325c8d64ae54816a1e06ffeb07c11d6647c6..aacba98c3f7bfe8d5ceaf9e9f50ccd682d6c9edc 100644 (file)
--- a/arch/arm/mach-tegra/tegra_usb_phy.h
+++ b/arch/arm/mach-tegra/tegra_usb_phy.h
@@ -80,6 +80,7 @@ struct tegra_usb_phy {
        struct clk *emc_clk;
        struct clk *sys_clk;
        struct regulator *vdd_reg;
+       struct regulator *hsic_reg;
        struct regulator *vbus_reg;
        struct tegra_usb_phy_ops *ops;
        struct tegra_xtal_freq *freq;
@@ -97,6 +98,7 @@ struct tegra_usb_phy {
        bool ulpi_clk_padout_ena;
        bool pmc_sleepwalk;
        bool bus_reseting;
+       bool linkphy_init;
 };
 
 int usb_phy_reg_status_wait(void __iomem *reg, u32 mask,