usb: dwc3: omap: use of_platform API to create dwc3 core pdev
Used of_platform_populate() to create dwc3 core platform_device from device tree data. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
parent
94c6a436f6
commit
b4bfe6aa9b
|
@ -47,6 +47,7 @@
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
#include <linux/of_platform.h>
|
||||||
|
|
||||||
#include <linux/usb/otg.h>
|
#include <linux/usb/otg.h>
|
||||||
#include <linux/usb/nop-usb-xceiv.h>
|
#include <linux/usb/nop-usb-xceiv.h>
|
||||||
|
@ -133,7 +134,6 @@ struct dwc3_omap {
|
||||||
/* device lock */
|
/* device lock */
|
||||||
spinlock_t lock;
|
spinlock_t lock;
|
||||||
|
|
||||||
struct platform_device *dwc3;
|
|
||||||
struct platform_device *usb2_phy;
|
struct platform_device *usb2_phy;
|
||||||
struct platform_device *usb3_phy;
|
struct platform_device *usb3_phy;
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
|
@ -276,7 +276,6 @@ static int dwc3_omap_probe(struct platform_device *pdev)
|
||||||
struct dwc3_omap_data *pdata = pdev->dev.platform_data;
|
struct dwc3_omap_data *pdata = pdev->dev.platform_data;
|
||||||
struct device_node *node = pdev->dev.of_node;
|
struct device_node *node = pdev->dev.of_node;
|
||||||
|
|
||||||
struct platform_device *dwc3;
|
|
||||||
struct dwc3_omap *omap;
|
struct dwc3_omap *omap;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
|
@ -323,30 +322,19 @@ static int dwc3_omap_probe(struct platform_device *pdev)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
|
|
||||||
if (!dwc3) {
|
|
||||||
dev_err(dev, "couldn't allocate dwc3 device\n");
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
context = devm_kzalloc(dev, resource_size(res), GFP_KERNEL);
|
context = devm_kzalloc(dev, resource_size(res), GFP_KERNEL);
|
||||||
if (!context) {
|
if (!context) {
|
||||||
dev_err(dev, "couldn't allocate dwc3 context memory\n");
|
dev_err(dev, "couldn't allocate dwc3 context memory\n");
|
||||||
goto err2;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_lock_init(&omap->lock);
|
spin_lock_init(&omap->lock);
|
||||||
dma_set_coherent_mask(&dwc3->dev, dev->coherent_dma_mask);
|
|
||||||
|
|
||||||
dwc3->dev.parent = dev;
|
|
||||||
dwc3->dev.dma_mask = dev->dma_mask;
|
|
||||||
dwc3->dev.dma_parms = dev->dma_parms;
|
|
||||||
omap->resource_size = resource_size(res);
|
omap->resource_size = resource_size(res);
|
||||||
omap->context = context;
|
omap->context = context;
|
||||||
omap->dev = dev;
|
omap->dev = dev;
|
||||||
omap->irq = irq;
|
omap->irq = irq;
|
||||||
omap->base = base;
|
omap->base = base;
|
||||||
omap->dwc3 = dwc3;
|
|
||||||
|
|
||||||
reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
|
reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
|
||||||
|
|
||||||
|
@ -391,7 +379,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(dev, "failed to request IRQ #%d --> %d\n",
|
dev_err(dev, "failed to request IRQ #%d --> %d\n",
|
||||||
omap->irq, ret);
|
omap->irq, ret);
|
||||||
goto err2;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* enable all IRQs */
|
/* enable all IRQs */
|
||||||
|
@ -410,24 +398,16 @@ static int dwc3_omap_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg);
|
dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg);
|
||||||
|
|
||||||
ret = platform_device_add_resources(dwc3, pdev->resource,
|
if (node) {
|
||||||
pdev->num_resources);
|
ret = of_platform_populate(node, NULL, NULL, dev);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(dev, "couldn't add resources to dwc3 device\n");
|
dev_err(&pdev->dev,
|
||||||
goto err2;
|
"failed to add create dwc3 core\n");
|
||||||
}
|
return ret;
|
||||||
|
}
|
||||||
ret = platform_device_add(dwc3);
|
|
||||||
if (ret) {
|
|
||||||
dev_err(dev, "failed to register dwc3 device\n");
|
|
||||||
goto err2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err2:
|
|
||||||
platform_device_put(dwc3);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dwc3_omap_remove(struct platform_device *pdev)
|
static int dwc3_omap_remove(struct platform_device *pdev)
|
||||||
|
|
Loading…
Reference in New Issue