summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-03-04 16:57:31 +0100
committerMike Turquette <mturquette@linaro.org>2012-05-08 16:33:57 -0700
commit4f04be62af95119d258b8035f498100e43c8c527 (patch)
tree86778fee3006ca06791bcbf65ea437a1e13fded7 /arch/arm/mach-kirkwood
parent452503ebc7cc4cce5b9e52cf2f03255365a53234 (diff)
downloadop-kernel-dev-4f04be62af95119d258b8035f498100e43c8c527.zip
op-kernel-dev-4f04be62af95119d258b8035f498100e43c8c527.tar.gz
ARM: Orion: WDT: Add clk/clkdev support
Remove tclk from platform data. This makes the platform data structure empty, so remove it. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Jamie Lentin <jm@lentin.co.uk> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r--arch/arm/mach-kirkwood/common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index c223544..880f366 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -112,6 +112,7 @@ void __init kirkwood_clk_init(void)
orion_clkdev_add(NULL, "orion_spi.1", runit);
orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0);
orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1);
+ orion_clkdev_add(NULL, "orion_wdt", tclk);
}
/*****************************************************************************
@@ -351,7 +352,7 @@ void __init kirkwood_xor1_init(void)
****************************************************************************/
void __init kirkwood_wdt_init(void)
{
- orion_wdt_init(kirkwood_tclk);
+ orion_wdt_init();
}
OpenPOWER on IntegriCloud