From: peter.chen@freescale.com (Peter Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/12] usb: phy-mxs: Add anatop regmap
Date: Sat, 12 Oct 2013 17:09:37 +0800 [thread overview]
Message-ID: <1381568986-19802-4-git-send-email-peter.chen@freescale.com> (raw)
In-Reply-To: <1381568986-19802-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 831b13e..e0b0de0 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"
@@ -58,6 +60,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)
@@ -203,9 +206,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;
@@ -228,6 +232,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-12 9:09 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 9:09 [PATCH 00/12] Add power management support for MXS PHY Peter Chen
2013-10-12 9:09 ` [PATCH 01/12] usb: phy-mxs: Add auto clock and power setting Peter Chen
2013-10-12 9:09 ` [PATCH 02/12] usb: phy-mxs: Enable IC fixes for mx6 SoC serial Peter Chen
2013-10-12 9:38 ` Marek Vasut
2013-10-14 1:31 ` Peter Chen
2013-10-14 2:07 ` Marek Vasut
2013-10-14 1:58 ` Peter Chen
2013-10-14 9:09 ` Shawn Guo
2013-10-14 9:09 ` Peter Chen
2013-10-14 9:29 ` Shawn Guo
2013-10-14 9:16 ` Peter Chen
2013-10-12 9:09 ` Peter Chen [this message]
2013-10-12 9:09 ` [PATCH 04/12] usb: phy: add notify suspend and resume callback Peter Chen
2013-10-12 9:09 ` [PATCH 05/12] usb: phy-mxs: Add implementation of nofity_suspend and notify_resume Peter Chen
2013-10-12 9:42 ` Marek Vasut
2013-10-14 1:36 ` Peter Chen
2013-10-14 2:08 ` Marek Vasut
2013-10-12 9:09 ` [PATCH 06/12] usb: phy: Add set_wakeup API Peter Chen
2013-10-12 9:09 ` [PATCH 07/12] usb: phy-mxs: Add implementation of set_wakeup Peter Chen
2013-10-12 9:44 ` Marek Vasut
2013-10-14 1:41 ` Peter Chen
2013-10-12 9:09 ` [PATCH 08/12] usb: phy-mxs: Add system suspend/resume API Peter Chen
2013-10-12 9:09 ` [PATCH 09/12] usb: phy-mxs: update binding for adding anatop phandle Peter Chen
2013-10-14 9:22 ` Shawn Guo
2013-10-14 9:10 ` Peter Chen
2013-10-12 9:09 ` [PATCH 10/12] ARM: dts: imx6: add anatop phandle for usbphy Peter Chen
2013-10-12 9:09 ` [PATCH 11/12] usb: phy-mxs: update binding for adding disconnect line property Peter Chen
2013-10-12 9:47 ` Marek Vasut
2013-10-14 1:44 ` Peter Chen
2013-10-12 15:05 ` Thomas Petazzoni
2013-10-14 1:45 ` Peter Chen
2013-10-12 9:09 ` [PATCH 12/12] ARM: dts: imx6: Add disconnect_line_without_vbus property for usbphy 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=1381568986-19802-4-git-send-email-peter.chen@freescale.com \
--to=peter.chen@freescale.com \
--cc=linux-arm-kernel@lists.infradead.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).