Commit 5ee1787e authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: musb: omap2430: drop non-DT support 



Drop support for non-DT systems, which hasn't been used by a mainline
kernel since commit 9080b8dc ("ARM: OMAP2+: Remove legacy usb-host.c
platform init code"). Specifically, since that commit usb_get_phy_dev()
have always returned -ENODEV when looking up a legacy phy, something
which in turn would have led to the init callback returning
-EPROBE_DEFER indefinitely.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e90308a6

drivers/usb/musb/omap2430.c

+45 −50
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ static int omap2430_musb_init(struct musb *musb) 
	 * up through ULPI.  TWL4030-family PMICs include one,

	 * which needs a driver, drivers aren't always needed.

	 */

	if (dev->parent->of_node) {

	musb->phy = devm_phy_get(dev->parent, "usb2-phy");



	/* We can't totally remove musb->xceiv as of now because
@@ -248,12 +247,7 @@ static int omap2430_musb_init(struct musb *musb) 
	 * out of xceiv and then we can start using the generic PHY

	 * framework

	 */

		musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent,

		    "usb-phy", 0);

	} else {

		musb->xceiv = devm_usb_get_phy_dev(dev, 0);

		musb->phy = devm_phy_get(dev, "usb");

	}

	musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent, "usb-phy", 0);



	if (IS_ERR(musb->xceiv)) {

		status = PTR_ERR(musb->xceiv);
@@ -391,8 +385,13 @@ static int omap2430_probe(struct platform_device *pdev) 
	struct omap2430_glue		*glue;

	struct device_node		*np = pdev->dev.of_node;

	struct musb_hdrc_config		*config;

	struct device_node		*control_node;

	struct platform_device		*control_pdev;

	int				ret = -ENOMEM, val;



	if (!np)

		return -ENODEV;



	glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);

	if (!glue)

		goto err0;
@@ -412,10 +411,6 @@ static int omap2430_probe(struct platform_device *pdev) 
	glue->status			= MUSB_UNKNOWN;

	glue->control_otghs = ERR_PTR(-ENODEV);



	if (np) {

		struct device_node *control_node;

		struct platform_device *control_pdev;



	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		goto err2;
@@ -452,7 +447,7 @@ static int omap2430_probe(struct platform_device *pdev) 
		}

		glue->control_otghs = &control_pdev->dev;

	}

	}



	pdata->platform_ops		= &omap2430_ops;



	platform_set_drvdata(pdev, glue);

CRA Git | Maintained and supported by SUSTech CRA and CCSE