From: Gerhard Sittig <gsi@denx.de>
To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org
Cc: Mark Rutland <mark.rutland@arm.com>,
Anatolij Gustschin <agust@denx.de>,
Mike Turquette <mturquette@linaro.org>,
Pawel Moll <pawel.moll@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Gerhard Sittig <gsi@denx.de>, Rob Herring <robh+dt@kernel.org>,
Shawn Guo <shawn.guo@linaro.org>
Subject: [PATCH 1/3] fs_enet: update clock names to comply with FEC binding
Date: Mon, 24 Feb 2014 11:25:55 +0100 [thread overview]
Message-ID: <1393237557-31406-1-git-send-email-gsi@denx.de> (raw)
a recent FEC binding document update that was motivated by i.MX
development revealed that ARM and PowerPC implementations in Linux
did not agree on the clock names to use for the FEC nodes
change the OF clock lookup to prefer "ipg" over "per", which
improves compliance with the binding, and keeps compatibility
with former device trees
Signed-off-by: Gerhard Sittig <gsi@denx.de>
---
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 62f042d4aaa9..ce20184b96cb 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -1037,11 +1037,20 @@ static int fs_enet_probe(struct platform_device *ofdev)
fpi->use_rmii = 1;
}
- /* make clock lookup non-fatal (the driver is shared among platforms),
+ /* the driver is shared across several PowerPC platforms, not all
+ * of them provide COMMON_CLK support, and newer kernels are supposed
+ * to keep working with older DT blobs, so clock lookup is non-fatal
+ *
* but require enable to succeed when a clock was specified/found,
* keep a reference to the clock upon successful acquisition
+ *
+ * the FEC binding is shared with ARM platforms, so we lookup several
+ * clock names to prefer the common naming convention yet support
+ * names that were used before unification
*/
- clk = devm_clk_get(&ofdev->dev, "per");
+ clk = devm_clk_get(&ofdev->dev, "ipg");
+ if (IS_ERR(clk))
+ clk = devm_clk_get(&ofdev->dev, "per");
if (!IS_ERR(clk)) {
err = clk_prepare_enable(clk);
if (err) {
--
1.7.10.4
next reply other threads:[~2014-02-24 10:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-24 10:25 Gerhard Sittig [this message]
2014-02-24 10:25 ` [PATCH 2/3] dts: mpc512x: adjust clock specs for FEC nodes Gerhard Sittig
2014-03-03 9:22 ` Gerhard Sittig
2014-03-05 1:48 ` Shawn Guo
2014-03-05 10:52 ` Gerhard Sittig
2014-03-06 10:21 ` Sascha Hauer
2014-02-24 10:25 ` [PATCH 3/3] dt/bindings: fsl-fec: add "per" to clock properties Gerhard Sittig
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=1393237557-31406-1-git-send-email-gsi@denx.de \
--to=gsi@denx.de \
--cc=agust@denx.de \
--cc=devicetree@vger.kernel.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mark.rutland@arm.com \
--cc=mturquette@linaro.org \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--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).