From: Peter Chen <peter.chen@freescale.com>
To: balbi@ti.com, shawn.guo@linaro.org, rob.herring@calxeda.com,
grant.likely@linaro.org
Cc: alexander.shishkin@linux.intel.com, linux-usb@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, festevam@gmail.com,
marex@denx.de, kernel@pengutronix.de, m.grzeschik@pengutronix.de,
frank.li@freescale.com, peter.chen@freescale.com,
gregkh@linuxfoundation.org, devicetree@vger.kernel.org,
linux-doc@vger.kernel.org
Subject: [Patch v2 06/14] usb: phy-mxs: Add anatop regmap
Date: Tue, 22 Oct 2013 13:58:40 +0800 [thread overview]
Message-ID: <1382421528-17897-7-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1382421528-17897-1-git-send-email-peter.chen@freescale.com>
It is needed by mx6 SoC serial, but not for mx23 and mx28.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
drivers/usb/phy/phy-mxs-usb.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 87ba429..6d48bde 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -21,6 +21,8 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
#define DRIVER_NAME "mxs_phy"
@@ -52,6 +54,7 @@ struct mxs_phy {
struct usb_phy phy;
struct clk *clk;
enum imx_phy_type devtype;
+ struct regmap *regmap_anatop;
};
static inline int is_mx6q_phy(struct mxs_phy *data)
@@ -193,9 +196,10 @@ static int mxs_phy_probe(struct platform_device *pdev)
int ret;
const struct of_device_id *of_id =
of_match_device(mxs_phy_dt_ids, &pdev->dev);
+ struct device_node *np = pdev->dev.of_node;
/* This driver is DT-only version now */
- if (!of_id)
+ if (!of_id || !np)
return -ENXIO;
pdev->id_entry = of_id->data;
@@ -218,6 +222,17 @@ static int mxs_phy_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ /* Some SoCs don't have anatop registers */
+ if (of_get_property(np, "fsl,anatop", NULL)) {
+ mxs_phy->regmap_anatop = syscon_regmap_lookup_by_phandle
+ (np, "fsl,anatop");
+ if (IS_ERR(mxs_phy->regmap_anatop)) {
+ dev_dbg(&pdev->dev,
+ "failed to find regmap for anatop\n");
+ return PTR_ERR(mxs_phy->regmap_anatop);
+ }
+ }
+
mxs_phy->phy.io_priv = base;
mxs_phy->phy.dev = &pdev->dev;
mxs_phy->phy.label = DRIVER_NAME;
--
1.7.1
next prev parent reply other threads:[~2013-10-22 5:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 5:58 [Patch v2 00/14] Add power management support for MXS PHY Peter Chen
2013-10-22 5:58 ` [Patch v2 01/14] usb: doc: phy-mxs: Add more compatible strings Peter Chen
2013-10-23 2:58 ` Shawn Guo
[not found] ` <1382421528-17897-2-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-10-23 5:56 ` Shawn Guo
2013-10-23 6:17 ` Peter Chen
[not found] ` <1382421528-17897-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-10-22 5:58 ` [Patch v2 02/14] usb: phy-mxs: Add platform judgement code Peter Chen
2013-10-23 6:13 ` Shawn Guo
2013-10-23 6:46 ` Peter Chen
2013-10-23 9:04 ` Shawn Guo
2013-10-23 8:55 ` Peter Chen
2013-10-22 5:58 ` [Patch v2 05/14] ARM: dts: imx6: add anatop phandle for usbphy Peter Chen
2013-10-22 5:58 ` [Patch v2 08/14] usb: phy-mxs: Add implementation of nofity_suspend and notify_resume Peter Chen
2013-10-22 5:58 ` [Patch v2 11/14] ARM: dts: imx6: Add disconnect-line-without-vbus property for usbphy Peter Chen
2013-10-22 5:58 ` [Patch v2 03/14] usb: phy-mxs: Add auto clock and power setting Peter Chen
2013-10-22 5:58 ` [Patch v2 04/14] usb: doc: phy-mxs: update binding for adding anatop phandle Peter Chen
2013-10-22 5:58 ` Peter Chen [this message]
2013-10-22 5:58 ` [Patch v2 07/14] usb: phy: add notify suspend and resume callback Peter Chen
2013-10-22 5:58 ` [Patch v2 09/14] usb: phy-mxs: Enable IC fixes for mx6 SoC serial Peter Chen
2013-10-22 5:58 ` [Patch v2 10/14] usb: doc: phy-mxs: update binding for adding disconnect line property Peter Chen
2013-10-23 6:31 ` Shawn Guo
2013-10-23 6:49 ` Peter Chen
2013-10-23 7:08 ` Peter Chen
2013-10-23 8:44 ` Shawn Guo
2013-10-22 5:58 ` [Patch v2 12/14] usb: phy: Add set_wakeup API Peter Chen
2013-10-22 5:58 ` [Patch v2 13/14] usb: phy-mxs: Add implementation of set_wakeup Peter Chen
2013-10-23 6:35 ` Shawn Guo
2013-10-23 6:54 ` Peter Chen
2013-10-22 5:58 ` [Patch v2 14/14] usb: phy-mxs: Add system suspend/resume API Peter Chen
2013-10-22 9:29 ` [Patch v2 00/14] Add power management support for MXS PHY Peter Chen
2013-10-28 8:20 ` Peter Chen
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=1382421528-17897-7-git-send-email-peter.chen@freescale.com \
--to=peter.chen@freescale.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=balbi@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=frank.li@freescale.com \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=m.grzeschik@pengutronix.de \
--cc=marex@denx.de \
--cc=rob.herring@calxeda.com \
--cc=shawn.guo@linaro.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;
as well as URLs for NNTP newsgroup(s).