1 files changed, 31 insertions, 31 deletions

diff --git a/arch/arm/mach-tegra/board-enterprise-baseband.c b/arch/arm/mach-tegra/board-enterprise-baseband.c
index 7552e2871541..9143103fd036 100644
--- a/arch/arm/mach-tegra/board-enterprise-baseband.c
+++ b/arch/arm/mach-tegra/board-enterprise-baseband.c
@@ -67,35 +67,42 @@ static struct gpio modem_gpios[] = {
 	{ULPI_D1, GPIOF_OUT_INIT_LOW, "ULPI_D1"},
 };
 
-static int baseband_phy_on(void);
-static int baseband_phy_off(void);
-static void baseband_phy_restore_start(void);
-static void baseband_phy_restore_end(void);
+static void baseband_phy_init(void);
+static void baseband_phy_on(void);
+static void baseband_phy_off(void);
 
-static struct tegra_ulpi_trimmer e1219_trimmer = { 10, 1, 1, 1 };
-
-static struct tegra_ulpi_config ehci2_null_ulpi_phy_config = {
-	.trimmer = &e1219_trimmer,
-	.post_phy_on = baseband_phy_on,
+static struct tegra_usb_phy_platform_ops ulpi_null_plat_ops = {
+	.init = baseband_phy_init,
 	.pre_phy_off = baseband_phy_off,
-	.phy_restore_start = baseband_phy_restore_start,
-	.phy_restore_end = baseband_phy_restore_end,
-	.phy_restore_gpio = MDM2AP_ACK,
-	.ulpi_dir_gpio = ULPI_DIR,
-	.ulpi_d0_gpio = ULPI_D0,
-	.ulpi_d1_gpio = ULPI_D1,
+	.post_phy_on = baseband_phy_on,
 };
 
-static struct tegra_ehci_platform_data ehci2_null_ulpi_platform_data = {
-	.operating_mode = TEGRA_USB_HOST,
-	.power_down_on_bus_suspend = 0,
-	.phy_config = &ehci2_null_ulpi_phy_config,
-	.phy_type = TEGRA_USB_PHY_TYPE_NULL_ULPI,
+static struct tegra_usb_platform_data tegra_ehci2_ulpi_null_pdata = {
+	.port_otg = false,
+	.has_hostpc = true,
+	.phy_intf = TEGRA_USB_PHY_INTF_ULPI_NULL,
+	.op_mode	= TEGRA_USB_OPMODE_HOST,
+	.u_data.host = {
+		.vbus_gpio = -1,
+		.vbus_reg = NULL,
+		.hot_plug = false,
+		.remote_wakeup_supported = false,
+		.power_off_on_suspend = true,
+	},
+	.u_cfg.ulpi = {
+		.shadow_clk_delay = 10,
+		.clock_out_delay = 1,
+		.data_trimmer = 1,
+		.stpdirnxt_trimmer = 1,
+		.dir_trimmer = 1,
+		.clk = NULL,
+	},
+	.ops = &ulpi_null_plat_ops,
 };
 
 static int __init tegra_null_ulpi_init(void)
 {
-	tegra_ehci2_device.dev.platform_data = &ehci2_null_ulpi_platform_data;
+	tegra_ehci2_device.dev.platform_data = &tegra_ehci2_ulpi_null_pdata;
 	platform_device_register(&tegra_ehci2_device);
 	return 0;
 }
@@ -114,7 +121,7 @@ static irqreturn_t mdm_start_thread(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-static int baseband_phy_on(void)
+static void baseband_phy_init(void)
 {
 	static bool phy_init = false;
 
@@ -124,22 +131,15 @@ static int baseband_phy_on(void)
 		phy_init = true;
 	}
 	pr_info("%s\n", __func__);
-	return 0;
-}
-
-static int baseband_phy_off(void)
-{
-	pr_info("%s\n", __func__);
-	return 0;
 }
 
-static void baseband_phy_restore_start(void)
+static void baseband_phy_off(void)
 {
 	/* set AP2MDM_ACK2 high */
 	gpio_set_value(AP2MDM_ACK2, 1);
 }
 
-static void baseband_phy_restore_end(void)
+static void baseband_phy_on(void)
 {
 	/* set AP2MDM_ACK2 low */
 	gpio_set_value(AP2MDM_ACK2, 0);