[PATCH 4/6] kirkwood: setup clock only in eth helpers.
From: Ian Molton <hidden>
Date: 2012-07-30 15:15:57
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
This patch modifies the ethernet setup helper functions so that they can be used /purely/ to set up the clocks. This is part of ongoing work to enable device tree support in the mv643xx.c ethernet driver, where as yet the kirkwood platform does not have proper clk support. This should allow a gradual migration to device tree and later to proper clk support, wherupon the helper functions can be removed entirely. Signed-off-by: Ian Molton <redacted> --- arch/arm/mach-kirkwood/common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index c4b64ad..c1776ea 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c@@ -299,7 +299,8 @@ void __init kirkwood_ehci_init(void) ****************************************************************************/ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) { - orion_ge00_init(eth_data, + if (eth_data) + orion_ge00_init(eth_data, GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM, IRQ_KIRKWOOD_GE00_ERR); /* The interface forgets the MAC address assigned by u-boot if
@@ -313,7 +314,8 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) ****************************************************************************/ void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data) { - orion_ge01_init(eth_data, + if (eth_data) + orion_ge01_init(eth_data, GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM, IRQ_KIRKWOOD_GE01_ERR); clk_prepare_enable(ge1);
--
1.7.9.5