mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Vivek Gautam <gautam.vivek@samsung.com>,
	linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
	andrew.kim@intel.com
Subject: [PATCHv5 3/7] phy: twl4030: use the new lookup method
Date: Wed, 19 Nov 2014 17:28:19 +0200	[thread overview]
Message-ID: <1416410903-162369-4-git-send-email-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <1416410903-162369-1-git-send-email-heikki.krogerus@linux.intel.com>

Creates the lookup separately. Hard coding the consumer as
it can't be anything else except musb.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/phy/phy-twl4030-usb.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index e2698d29..0d20fe0 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -644,7 +644,6 @@ static int twl4030_usb_probe(struct platform_device *pdev)
 	struct usb_otg		*otg;
 	struct device_node	*np = pdev->dev.of_node;
 	struct phy_provider	*phy_provider;
-	struct phy_init_data	*init_data = NULL;
 
 	twl = devm_kzalloc(&pdev->dev, sizeof(*twl), GFP_KERNEL);
 	if (!twl)
@@ -655,7 +654,6 @@ static int twl4030_usb_probe(struct platform_device *pdev)
 				(enum twl4030_usb_mode *)&twl->usb_mode);
 	else if (pdata) {
 		twl->usb_mode = pdata->usb_mode;
-		init_data = pdata->init_data;
 	} else {
 		dev_err(&pdev->dev, "twl4030 initialized without pdata\n");
 		return -EINVAL;
@@ -680,7 +678,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
 	otg->set_host		= twl4030_set_host;
 	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)) {
 		dev_dbg(&pdev->dev, "Failed to create PHY\n");
 		return PTR_ERR(phy);
@@ -733,6 +731,11 @@ static int twl4030_usb_probe(struct platform_device *pdev)
 		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_put_autosuspend(twl->dev);
 
-- 
2.1.3


  parent reply	other threads:[~2014-11-19 15:28 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-19 15:28 [PATCHv5 0/7] phy: simplified phy lookup Heikki Krogerus
2014-11-19 15:28 ` [PATCHv5 1/7] phy: safer to_phy() macro Heikki Krogerus
2014-11-19 15:28 ` [PATCHv5 2/7] phy: improved lookup method Heikki Krogerus
2014-11-19 15:28 ` Heikki Krogerus [this message]
2014-11-19 15:28 ` [PATCHv5 4/7] arm: omap3: twl: remove usb phy init data Heikki Krogerus
2014-11-20  9:15   ` Kishon Vijay Abraham I
2014-12-03  5:41   ` [PATCH] " Kishon Vijay Abraham I
2014-12-03 16:17     ` Greg KH
2014-11-19 15:28 ` [PATCHv5 5/7] phy: remove the old lookup method Heikki Krogerus
2014-11-19 15:28 ` [PATCHv5 6/7] base: platform: name the device already during allocation Heikki Krogerus
2014-11-20  9:21   ` Kishon Vijay Abraham I
2015-02-02 12:12     ` Vivek Gautam
2014-11-19 15:28 ` [PATCHv5 7/7] usb: dwc3: host: convey the PHYs to xhci Heikki Krogerus
2014-11-20 11:29 ` [PATCHv5 0/7] phy: simplified phy lookup Vivek Gautam

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1416410903-162369-4-git-send-email-heikki.krogerus@linux.intel.com \
    --to=heikki.krogerus@linux.intel.com \
    --cc=andrew.kim@intel.com \
    --cc=gautam.vivek@samsung.com \
    --cc=kishon@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®