|
@@ -316,11 +316,11 @@ static int dwc3_omap_probe(struct platform_device *pdev)
|
|
|
struct resource *res;
|
|
|
struct device *dev = &pdev->dev;
|
|
|
|
|
|
- int size;
|
|
|
int ret = -ENOMEM;
|
|
|
int irq;
|
|
|
|
|
|
- const u32 *utmi_mode;
|
|
|
+ int utmi_mode = 0;
|
|
|
+
|
|
|
u32 reg;
|
|
|
|
|
|
void __iomem *base;
|
|
@@ -334,13 +334,13 @@ static int dwc3_omap_probe(struct platform_device *pdev)
|
|
|
|
|
|
platform_set_drvdata(pdev, omap);
|
|
|
|
|
|
- irq = platform_get_irq(pdev, 1);
|
|
|
+ irq = platform_get_irq(pdev, 0);
|
|
|
if (irq < 0) {
|
|
|
dev_err(dev, "missing IRQ resource\n");
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
- res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
|
|
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
if (!res) {
|
|
|
dev_err(dev, "missing memory base resource\n");
|
|
|
return -EINVAL;
|
|
@@ -387,25 +387,22 @@ static int dwc3_omap_probe(struct platform_device *pdev)
|
|
|
|
|
|
reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
|
|
|
|
|
|
- utmi_mode = of_get_property(node, "utmi-mode", &size);
|
|
|
- if (utmi_mode && size == sizeof(*utmi_mode)) {
|
|
|
- reg |= *utmi_mode;
|
|
|
- } else {
|
|
|
- if (!pdata) {
|
|
|
- dev_dbg(dev, "missing platform data\n");
|
|
|
- } else {
|
|
|
- switch (pdata->utmi_mode) {
|
|
|
- case DWC3_OMAP_UTMI_MODE_SW:
|
|
|
- reg |= USBOTGSS_UTMI_OTG_STATUS_SW_MODE;
|
|
|
- break;
|
|
|
- case DWC3_OMAP_UTMI_MODE_HW:
|
|
|
- reg &= ~USBOTGSS_UTMI_OTG_STATUS_SW_MODE;
|
|
|
- break;
|
|
|
- default:
|
|
|
- dev_dbg(dev, "UNKNOWN utmi mode %d\n",
|
|
|
- pdata->utmi_mode);
|
|
|
- }
|
|
|
- }
|
|
|
+ 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:
|
|
|
+ reg |= USBOTGSS_UTMI_OTG_STATUS_SW_MODE;
|
|
|
+ break;
|
|
|
+ case DWC3_OMAP_UTMI_MODE_HW:
|
|
|
+ reg &= ~USBOTGSS_UTMI_OTG_STATUS_SW_MODE;
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ dev_dbg(dev, "UNKNOWN utmi mode %d\n", utmi_mode);
|
|
|
}
|
|
|
|
|
|
dwc3_omap_writel(omap->base, USBOTGSS_UTMI_OTG_STATUS, reg);
|
|
@@ -465,7 +462,7 @@ static int dwc3_omap_remove(struct platform_device *pdev)
|
|
|
|
|
|
static const struct of_device_id of_dwc3_match[] = {
|
|
|
{
|
|
|
- "ti,dwc3",
|
|
|
+ .compatible = "ti,dwc3"
|
|
|
},
|
|
|
{ },
|
|
|
};
|