|
@@ -585,23 +585,28 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
|
|
|
struct twl4030_usb *twl;
|
|
|
int status, err;
|
|
|
struct usb_otg *otg;
|
|
|
-
|
|
|
- if (!pdata) {
|
|
|
- dev_dbg(&pdev->dev, "platform_data not available\n");
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
+ struct device_node *np = pdev->dev.of_node;
|
|
|
|
|
|
twl = devm_kzalloc(&pdev->dev, sizeof *twl, GFP_KERNEL);
|
|
|
if (!twl)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
+ if (np)
|
|
|
+ of_property_read_u32(np, "usb_mode",
|
|
|
+ (enum twl4030_usb_mode *)&twl->usb_mode);
|
|
|
+ else if (pdata)
|
|
|
+ twl->usb_mode = pdata->usb_mode;
|
|
|
+ else {
|
|
|
+ dev_err(&pdev->dev, "twl4030 initialized without pdata\n");
|
|
|
+ return -EINVAL;
|
|
|
+ }
|
|
|
+
|
|
|
otg = devm_kzalloc(&pdev->dev, sizeof *otg, GFP_KERNEL);
|
|
|
if (!otg)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
twl->dev = &pdev->dev;
|
|
|
twl->irq = platform_get_irq(pdev, 0);
|
|
|
- twl->usb_mode = pdata->usb_mode;
|
|
|
twl->vbus_supplied = false;
|
|
|
twl->asleep = 1;
|
|
|
twl->linkstat = OMAP_MUSB_UNKNOWN;
|
|
@@ -690,12 +695,21 @@ static int __exit twl4030_usb_remove(struct platform_device *pdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+#ifdef CONFIG_OF
|
|
|
+static const struct of_device_id twl4030_usb_id_table[] = {
|
|
|
+ { .compatible = "ti,twl4030-usb" },
|
|
|
+ {}
|
|
|
+};
|
|
|
+MODULE_DEVICE_TABLE(of, twl4030_usb_id_table);
|
|
|
+#endif
|
|
|
+
|
|
|
static struct platform_driver twl4030_usb_driver = {
|
|
|
.probe = twl4030_usb_probe,
|
|
|
.remove = __exit_p(twl4030_usb_remove),
|
|
|
.driver = {
|
|
|
.name = "twl4030_usb",
|
|
|
.owner = THIS_MODULE,
|
|
|
+ .of_match_table = of_match_ptr(twl4030_usb_id_table),
|
|
|
},
|
|
|
};
|
|
|
|