Commit 61211b1b authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Kishon Vijay Abraham I

phy: twl4030: use the new lookup method

Creates the lookup separately. Hard coding the consumer as
it can't be anything else except musb.
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent b7bc15b9
...@@ -644,7 +644,6 @@ static int twl4030_usb_probe(struct platform_device *pdev) ...@@ -644,7 +644,6 @@ static int twl4030_usb_probe(struct platform_device *pdev)
struct usb_otg *otg; struct usb_otg *otg;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct phy_provider *phy_provider; struct phy_provider *phy_provider;
struct phy_init_data *init_data = NULL;
twl = devm_kzalloc(&pdev->dev, sizeof(*twl), GFP_KERNEL); twl = devm_kzalloc(&pdev->dev, sizeof(*twl), GFP_KERNEL);
if (!twl) if (!twl)
...@@ -655,7 +654,6 @@ static int twl4030_usb_probe(struct platform_device *pdev) ...@@ -655,7 +654,6 @@ static int twl4030_usb_probe(struct platform_device *pdev)
(enum twl4030_usb_mode *)&twl->usb_mode); (enum twl4030_usb_mode *)&twl->usb_mode);
else if (pdata) { else if (pdata) {
twl->usb_mode = pdata->usb_mode; twl->usb_mode = pdata->usb_mode;
init_data = pdata->init_data;
} else { } else {
dev_err(&pdev->dev, "twl4030 initialized without pdata\n"); dev_err(&pdev->dev, "twl4030 initialized without pdata\n");
return -EINVAL; return -EINVAL;
...@@ -680,7 +678,7 @@ static int twl4030_usb_probe(struct platform_device *pdev) ...@@ -680,7 +678,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
otg->set_host = twl4030_set_host; otg->set_host = twl4030_set_host;
otg->set_peripheral = twl4030_set_peripheral; otg->set_peripheral = twl4030_set_peripheral;
phy = devm_phy_create(twl->dev, NULL, &ops, init_data); phy = devm_phy_create(twl->dev, NULL, &ops, NULL);
if (IS_ERR(phy)) { if (IS_ERR(phy)) {
dev_dbg(&pdev->dev, "Failed to create PHY\n"); dev_dbg(&pdev->dev, "Failed to create PHY\n");
return PTR_ERR(phy); return PTR_ERR(phy);
...@@ -733,6 +731,11 @@ static int twl4030_usb_probe(struct platform_device *pdev) ...@@ -733,6 +731,11 @@ static int twl4030_usb_probe(struct platform_device *pdev)
return status; return status;
} }
if (pdata)
err = phy_create_lookup(phy, "usb", "musb-hdrc.0");
if (err)
return err;
pm_runtime_mark_last_busy(&pdev->dev); pm_runtime_mark_last_busy(&pdev->dev);
pm_runtime_put_autosuspend(twl->dev); pm_runtime_put_autosuspend(twl->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment