On Fri, 24 May 2013, Jingoo Han wrote:
> From: Thomas Abraham <[email protected]>
>
> Exynos5440 does not require any explict USB phy configuration. So skip
> the USB phy configuration for Exynos5440 based platforms.
>
> Signed-off-by: Thomas Abraham <[email protected]>
> Signed-off-by: Jingoo Han <[email protected]>
> ---
> Changes since v2:
> - changed all occurrences of s5p_ehci->pdata->phy*.
> - set s5p_ehci->pdata to NULL.
>
> Changes since v1:
> - re-based on the latest 'linux-next' tree
Did you not understand the change I recommended? If you do the patch
that way, it will look like this:
Index: usb-3.9/drivers/usb/host/ehci-s5p.c
===================================================================
--- usb-3.9.orig/drivers/usb/host/ehci-s5p.c
+++ usb-3.9/drivers/usb/host/ehci-s5p.c
@@ -73,6 +73,8 @@ static void s5p_setup_vbus_gpio(struct p
static u64 ehci_s5p_dma_mask = DMA_BIT_MASK(32);
+static struct s5p_ehci_platdata empty_platdata;
+
static int s5p_ehci_probe(struct platform_device *pdev)
{
struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
@@ -103,6 +105,13 @@ static int s5p_ehci_probe(struct platfor
return -ENOMEM;
}
s5p_ehci = to_s5p_ehci(hcd);
+
+ if (of_device_is_compatible(pdev->dev.of_node,
+ "samsung,exynos5440-ehci")) {
+ s5p_ehci->pdata = &empty_platdata;
+ goto skip_phy;
+ }
+
phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
if (IS_ERR(phy)) {
/* Fallback to pdata */
@@ -117,6 +126,8 @@ static int s5p_ehci_probe(struct platfor
s5p_ehci->otg = phy->otg;
}
+skip_phy:
+
s5p_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");
if (IS_ERR(s5p_ehci->clk)) {
@@ -278,6 +289,7 @@ static const struct dev_pm_ops s5p_ehci_
#ifdef CONFIG_OF
static const struct of_device_id exynos_ehci_match[] = {
{ .compatible = "samsung,exynos4210-ehci" },
+ { .compatible = "samsung,exynos5440-ehci" },
{},
};
MODULE_DEVICE_TABLE(of, exynos_ehci_match);
This is shorter and more robust than your version. Still, if you want
to use your longer version, you can add
Acked-by: Alan Stern <[email protected]>
Alan Stern
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
