diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-04-06 17:17:26 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2012-05-08 16:33:55 -0700 |
| commit | 4574b886698dfad6209102fed6136622b5fe1c21 (patch) | |
| tree | 2f1deee540c68261f4531d09337a19a130a7ea45 /arch/arm/mach-orion5x | |
| parent | 2f129bf4aab684bef1e82e747b709a5025ecb698 (diff) | |
ARM: Orion: SPI: Add clk/clkdev support.
Remove now redundant tclk from SPI platform data. This makes the platform
data 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-orion5x')
| -rw-r--r-- | arch/arm/mach-orion5x/common.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 81660522c6b..2ef82e2f511 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -79,6 +79,8 @@ static void __init clk_init(void) { tclk = clk_register_fixed_rate(NULL, "tclk", NULL, CLK_IS_ROOT, orion5x_tclk); + + orion_clkdev_init(tclk); } /***************************************************************************** @@ -144,7 +146,7 @@ void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data) ****************************************************************************/ void __init orion5x_spi_init() { - orion_spi_init(SPI_PHYS_BASE, orion5x_tclk); + orion_spi_init(SPI_PHYS_BASE); } diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c index 2c5fab00d20..7b97a9a211e 100644 --- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c +++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c @@ -16,7 +16,6 @@ #include <linux/mtd/physmap.h> #include <linux/mv643xx_eth.h> #include <linux/spi/spi.h> -#include <linux/spi/orion_spi.h> #include <linux/spi/flash.h> #include <linux/ethtool.h> #include <net/dsa.h> |