From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] ARM: Kirkwood: Revert clkdev changes.
Date: Sat, 26 Jan 2013 16:10:29 +0100 [thread overview]
Message-ID: <1359213030-18588-3-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1359213030-18588-1-git-send-email-andrew@lunn.ch>
Now that the Ethernet driver can get its clock from device tree,
revert this change which broken non-DT probing of the ethernet device.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/mach-kirkwood/board-dt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 7ab92e5..edb1215 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -48,7 +48,7 @@ static void __init kirkwood_legacy_clk_init(void)
clkspec.args_count = 1;
clkspec.args[0] = CGC_BIT_GE0;
- orion_clkdev_add(NULL, "f1072000.egiga0",
+ orion_clkdev_add(NULL, "mv643xx_eth_port.0",
of_clk_get_from_provider(&clkspec));
clkspec.args[0] = CGC_BIT_PEX0;
@@ -60,7 +60,7 @@ static void __init kirkwood_legacy_clk_init(void)
of_clk_get_from_provider(&clkspec));
clkspec.args[0] = CGC_BIT_GE1;
- orion_clkdev_add(NULL, "f1076000.egiga1",
+ orion_clkdev_add(NULL, "mv643xx_eth_port.1",
of_clk_get_from_provider(&clkspec));
}
--
1.7.10.4
next prev parent reply other threads:[~2013-01-26 15:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-26 15:10 [PATCH 0/3] Fixes and DT conversion for QNAP TS219 Andrew Lunn
2013-01-26 15:10 ` [PATCH 1/3] NET: mv643xx: Get clk from device tree Andrew Lunn
2013-01-26 15:46 ` Jason Cooper
2013-01-26 15:10 ` Andrew Lunn [this message]
2013-01-26 19:59 ` [PATCH 2/3] ARM: Kirkwood: Revert clkdev changes Jason Cooper
2013-01-26 15:10 ` [PATCH 3/3] ARM: Kirkwood: Convert QNAP TS219 Ethernet to DT Andrew Lunn
2013-01-26 20:10 ` 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=1359213030-18588-3-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--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).