From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3] ARM: kirkwood: remove ethernet clock gate workaround
Date: Fri, 4 Oct 2013 12:13:50 +0200 [thread overview]
Message-ID: <1380881630-24439-1-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1380826568-18587-1-git-send-email-sebastian.hesselbarth@gmail.com>
With a proper fix for Kirkwood ethernet IP MAC address clock gating
issue, we can now remove the clock gating workaround that always
enabled ethernet clocks.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Changelog:
v2->v3:
- make use of new public clk_is_enabled, adds dependency to [1]
- add warning about gated clock && missing MAC property
(Suggested by Jason Gunthorpe)
v1->v2:
- check for gated clock before accessing eth registers
(Suggested by Andrew Lunn)
[1] http://www.spinics.net/lists/arm-kernel/msg277392.html
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-kirkwood/board-dt.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 28e952b..6925de8 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -41,7 +41,6 @@ static void __init kirkwood_legacy_clk_init(void)
struct device_node *np = of_find_compatible_node(
NULL, NULL, "marvell,kirkwood-gating-clock");
struct of_phandle_args clkspec;
- struct clk *clk;
clkspec.np = np;
clkspec.args_count = 1;
@@ -53,19 +52,6 @@ static void __init kirkwood_legacy_clk_init(void)
clkspec.args[0] = CGC_BIT_PEX1;
orion_clkdev_add("1", "pcie",
of_clk_get_from_provider(&clkspec));
-
- /*
- * The ethernet interfaces forget the MAC address assigned by
- * u-boot if the clocks are turned off. Until proper DT support
- * is available we always enable them for now.
- */
- clkspec.args[0] = CGC_BIT_GE0;
- clk = of_clk_get_from_provider(&clkspec);
- clk_prepare_enable(clk);
-
- clkspec.args[0] = CGC_BIT_GE1;
- clk = of_clk_get_from_provider(&clkspec);
- clk_prepare_enable(clk);
}
#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
--
1.7.10.4
next prev parent reply other threads:[~2013-10-04 10:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-03 12:44 [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet Sebastian Hesselbarth
2013-10-03 12:44 ` [PATCH 2/2] ARM: kirkwood: remove ethernet clock gate workaround Sebastian Hesselbarth
2013-10-03 13:50 ` Ezequiel Garcia
2013-10-03 13:47 ` [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet Andrew Lunn
2013-10-03 15:15 ` Sebastian Hesselbarth
2013-10-03 18:56 ` [PATCH v2 " Sebastian Hesselbarth
2013-10-03 19:02 ` Ezequiel Garcia
2013-10-03 19:04 ` Jason Cooper
2013-10-03 19:44 ` Jason Gunthorpe
2013-10-03 20:14 ` Sebastian Hesselbarth
2013-10-03 20:24 ` Andrew Lunn
2013-10-04 10:13 ` Sebastian Hesselbarth [this message]
2013-10-04 10:14 ` [PATCH v3] ARM: kirkwood: remove ethernet clock gate workaround Sebastian Hesselbarth
2013-10-04 10:17 ` [PATCH RESEND v3] ARM: kirkwood: retain MAC address for DT ethernet Sebastian Hesselbarth
2013-10-04 13:28 ` Andrew Lunn
2013-10-07 20:25 ` [PATCH v4] " Sebastian Hesselbarth
2013-10-07 23:30 ` Mike Turquette
2013-10-08 17:03 ` Jason Cooper
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=1380881630-24439-1-git-send-email-sebastian.hesselbarth@gmail.com \
--to=sebastian.hesselbarth@gmail.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).