Commit 4495afcf authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Felipe Balbi
Browse files

usb: dwc3: omap: remove platform data associated with dwc3-omap 



omap5 is not going to have support for non-dt boot making the platform
data associated with dwc3 useless. Removed it here.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e36a0c87

drivers/usb/dwc3/dwc3-omap.c

+10 −14
Original line number Diff line number Diff line
@@ -309,7 +309,6 @@ static int dwc3_omap_remove_core(struct device *dev, void *c) 


static int dwc3_omap_probe(struct platform_device *pdev)

{

	struct dwc3_omap_data	*pdata = pdev->dev.platform_data;

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



	struct dwc3_omap	*omap;
@@ -326,6 +325,11 @@ static int dwc3_omap_probe(struct platform_device *pdev) 
	void __iomem		*base;

	void			*context;



	if (!node) {

		dev_err(dev, "device node not found\n");

		return -EINVAL;

	}



	omap = devm_kzalloc(dev, sizeof(*omap), GFP_KERNEL);

	if (!omap) {

		dev_err(dev, "not enough memory\n");
@@ -387,12 +391,7 @@ static int dwc3_omap_probe(struct platform_device *pdev) 


	reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);



	if (node)

	of_property_read_u32(node, "utmi-mode", &utmi_mode);

	else if (pdata)

		utmi_mode = pdata->utmi_mode;

	else

		dev_dbg(dev, "missing platform data\n");



	switch (utmi_mode) {

	case DWC3_OMAP_UTMI_MODE_SW:
@@ -435,14 +434,11 @@ static int dwc3_omap_probe(struct platform_device *pdev) 


	dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg);



	if (node) {

	ret = of_platform_populate(node, NULL, NULL, dev);

	if (ret) {

			dev_err(&pdev->dev,

				"failed to add create dwc3 core\n");

		dev_err(&pdev->dev, "failed to create dwc3 core\n");

		return ret;

	}

	}



	return 0;

}

include/linux/platform_data/dwc3-omap.h

+0 −4
Original line number Diff line number Diff line
@@ -41,7 +41,3 @@ enum dwc3_omap_utmi_mode { 
	DWC3_OMAP_UTMI_MODE_HW,

	DWC3_OMAP_UTMI_MODE_SW,

};
 


struct dwc3_omap_data {

	enum dwc3_omap_utmi_mode	utmi_mode;

};