Merge branch 'for-3.5/usb-ulpi' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/drivers

By Stephen Warren (30) and others
via Stephen Warren
* 'for-3.5/usb-ulpi' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (7 commits)
  ARM: dt: tegra: pinmux changes for USB ULPI
  ARM: tegra: add USB ULPI PHY reset GPIO to device tree
  ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
  ARM: tegra: change pll_p_out4's rate to 24MHz
  ARM: tegra: fix pclk rate
  ARM: tegra: reparent sclk to pll_c_out1
  ARM: tegra: Add pllc clock init table
  + depends/pinctrl/mergebase branch

Pinctrl mergebase has a conflict in drivers/pinctrl/core.c that was resolved.

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 86183366647f..10bb3ea276f9 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -581,15 +581,16 @@ static const struct hc_driver tegra_ehci_hc_driver = {
         .port_handed_over       = ehci_port_handed_over,
 };
 
-static int setup_vbus_gpio(struct platform_device *pdev)
+static int setup_vbus_gpio(struct platform_device *pdev,
+                           struct tegra_ehci_platform_data *pdata)
 {
         int err = 0;
         int gpio;
 
-        if (!pdev->dev.of_node)
-                return 0;
-
-        gpio = of_get_named_gpio(pdev->dev.of_node, "nvidia,vbus-gpio", 0);
+        gpio = pdata->vbus_gpio;
+        if (!gpio_is_valid(gpio))
+                gpio = of_get_named_gpio(pdev->dev.of_node,
+                                         "nvidia,vbus-gpio", 0);
         if (!gpio_is_valid(gpio))
                 return 0;
 
@@ -633,7 +634,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
         if (!pdev->dev.dma_mask)
                 pdev->dev.dma_mask = &tegra_ehci_dma_mask;
 
-        setup_vbus_gpio(pdev);
+        setup_vbus_gpio(pdev, pdata);
 
         tegra = kzalloc(sizeof(struct tegra_ehci_hcd), GFP_KERNEL);
         if (!tegra)
@@ -707,8 +708,9 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                 }
         }
 
-        tegra->phy = tegra_usb_phy_open(instance, hcd->regs, pdata->phy_config,
-                                                TEGRA_USB_PHY_MODE_HOST);
+        tegra->phy = tegra_usb_phy_open(&pdev->dev, instance, hcd->regs,
+                                        pdata->phy_config,
+                                        TEGRA_USB_PHY_MODE_HOST);
         if (IS_ERR(tegra->phy)) {
                 dev_err(&pdev->dev, "Failed to open USB phy\n");
                 err = -ENXIO;