Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4574b886 authored by Andrew Lunn's avatar Andrew Lunn Committed by Mike Turquette
Browse files

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: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarJamie Lentin <jm@lentin.co.uk>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 2f129bf4

arch/arm/mach-dove/common.c

+4 −2
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ static void __init clk_init(void) 
{

	tclk = clk_register_fixed_rate(NULL, "tclk", NULL, CLK_IS_ROOT,

				       get_tclk());



	orion_clkdev_init(tclk);

}



/*****************************************************************************
@@ -162,12 +164,12 @@ void __init dove_uart3_init(void) 
 ****************************************************************************/

void __init dove_spi0_init(void)

{

	orion_spi_init(DOVE_SPI0_PHYS_BASE, get_tclk());

	orion_spi_init(DOVE_SPI0_PHYS_BASE);

}



void __init dove_spi1_init(void)

{

	orion_spi_1_init(DOVE_SPI1_PHYS_BASE, get_tclk());

	orion_spi_1_init(DOVE_SPI1_PHYS_BASE);

}



/*****************************************************************************

arch/arm/mach-dove/dove-db-setup.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/i2c.h>

#include <linux/pci.h>

#include <linux/spi/spi.h>

#include <linux/spi/orion_spi.h>

#include <linux/spi/flash.h>

#include <linux/gpio.h>

#include <asm/mach-types.h>

arch/arm/mach-kirkwood/board-dreamplug.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/mtd/physmap.h>

#include <linux/spi/flash.h>

#include <linux/spi/spi.h>

#include <linux/spi/orion_spi.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

arch/arm/mach-kirkwood/common.c

+8 −2
Original line number Diff line number Diff line
@@ -86,10 +86,12 @@ static struct clk __init *kirkwood_register_gate(const char *name, u8 bit_idx) 


void __init kirkwood_clk_init(void)

{

	struct clk *runit;



	tclk = clk_register_fixed_rate(NULL, "tclk", NULL,

				       CLK_IS_ROOT, kirkwood_tclk);



	kirkwood_register_gate("runit",  CGC_BIT_RUNIT);

	runit = kirkwood_register_gate("runit",  CGC_BIT_RUNIT);

	kirkwood_register_gate("ge0",    CGC_BIT_GE0);

	kirkwood_register_gate("ge1",    CGC_BIT_GE1);

	kirkwood_register_gate("sata0",  CGC_BIT_SATA0);
@@ -104,6 +106,10 @@ void __init kirkwood_clk_init(void) 
	kirkwood_register_gate("audio",  CGC_BIT_AUDIO);

	kirkwood_register_gate("tdm",    CGC_BIT_TDM);

	kirkwood_register_gate("tsu",    CGC_BIT_TSU);



	/* clkdev entries, mapping clks to devices */

	orion_clkdev_add(NULL, "orion_spi.0", runit);

	orion_clkdev_add(NULL, "orion_spi.1", runit);

}



/*****************************************************************************
@@ -270,7 +276,7 @@ void __init kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data) 
void __init kirkwood_spi_init()

{

	kirkwood_clk_ctrl |= CGC_RUNIT;

	orion_spi_init(SPI_PHYS_BASE, kirkwood_tclk);

	orion_spi_init(SPI_PHYS_BASE);

}

arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/gpio_keys.h>

#include <linux/spi/flash.h>

#include <linux/spi/spi.h>

#include <linux/spi/orion_spi.h>

#include <net/dsa.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>