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

Commit 3c0dec5f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'clk-next' of git://git.linaro.org/people/mturquette/linux into next/clock 

* 'clk-next' of git://git.linaro.org/people/mturquette/linux

:
  clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
  clk: Provide dummy clk_unregister()
  ARM: Kirkwood: Replace clock gating
  ARM: Orion: Audio: Add clk/clkdev support
  ARM: Orion: PCIE: Add support for clk
  ARM: Orion: XOR: Add support for clk
  ARM: Orion: CESA: Add support for clk
  ARM: Orion: SDIO: Add support for clk.
  ARM: Orion: NAND: Add support for clk, if there is one.
  ARM: Orion: EHCI: Add support for enabling clocks
  ARM: Orion: SATA: Add per channel clk/clkdev support.
  ARM: Orion: UART: Get the clock rate via clk_get_rate().
  ARM: Orion: WDT: Add clk/clkdev support
  ARM: Orion: Eth: Add clk/clkdev support.
  ARM: Orion: SPI: Add clk/clkdev support.
  ARM: Orion: Add clocks using the generic clk infrastructure.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fcd8d84a 7e0fa1b5

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1142,6 +1142,7 @@ config PLAT_ORION 
	bool

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select COMMON_CLK



config PLAT_PXA

	bool

arch/arm/mach-dove/common.c

+25 −14
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/pci.h>

#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/ata_platform.h>

#include <linux/gpio.h>

#include <asm/page.h>
@@ -67,6 +67,19 @@ void __init dove_map_io(void) 
	iotable_init(dove_io_desc, ARRAY_SIZE(dove_io_desc));

}



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

 * CLK tree

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

static struct clk *tclk;



static void __init clk_init(void)

{

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

				       get_tclk());



	orion_clkdev_init(tclk);

}



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

 * EHCI0

 ****************************************************************************/
@@ -89,8 +102,7 @@ void __init dove_ehci1_init(void) 
void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)

{

	orion_ge00_init(eth_data,

			DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM,

			0, get_tclk());

			DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM, 0);

}



/*****************************************************************************
@@ -116,7 +128,7 @@ void __init dove_sata_init(struct mv_sata_platform_data *sata_data) 
void __init dove_uart0_init(void)

{

	orion_uart0_init(DOVE_UART0_VIRT_BASE, DOVE_UART0_PHYS_BASE,

			 IRQ_DOVE_UART_0, get_tclk());

			 IRQ_DOVE_UART_0, tclk);

}



/*****************************************************************************
@@ -125,7 +137,7 @@ void __init dove_uart0_init(void) 
void __init dove_uart1_init(void)

{

	orion_uart1_init(DOVE_UART1_VIRT_BASE, DOVE_UART1_PHYS_BASE,

			 IRQ_DOVE_UART_1, get_tclk());

			 IRQ_DOVE_UART_1, tclk);

}



/*****************************************************************************
@@ -134,7 +146,7 @@ void __init dove_uart1_init(void) 
void __init dove_uart2_init(void)

{

	orion_uart2_init(DOVE_UART2_VIRT_BASE, DOVE_UART2_PHYS_BASE,

			 IRQ_DOVE_UART_2, get_tclk());

			 IRQ_DOVE_UART_2, tclk);

}



/*****************************************************************************
@@ -143,7 +155,7 @@ void __init dove_uart2_init(void) 
void __init dove_uart3_init(void)

{

	orion_uart3_init(DOVE_UART3_VIRT_BASE, DOVE_UART3_PHYS_BASE,

			 IRQ_DOVE_UART_3, get_tclk());

			 IRQ_DOVE_UART_3, tclk);

}



/*****************************************************************************
@@ -151,12 +163,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);

}



/*****************************************************************************
@@ -272,18 +284,17 @@ void __init dove_sdio1_init(void) 


void __init dove_init(void)

{

	int tclk;



	tclk = get_tclk();



	printk(KERN_INFO "Dove 88AP510 SoC, ");

	printk(KERN_INFO "TCLK = %dMHz\n", (tclk + 499999) / 1000000);

	printk(KERN_INFO "TCLK = %dMHz\n", (get_tclk() + 499999) / 1000000);



#ifdef CONFIG_CACHE_TAUROS2

	tauros2_init();

#endif

	dove_setup_cpu_mbus();



	/* Setup root of clk tree */

	clk_init();



	/* internal devices that every board has */

	dove_rtc_init();

	dove_xor0_init();

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/board-dt.c

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ static void __init kirkwood_dt_init(void) 
	kirkwood_l2_init();

#endif



	/* Setup root of clk tree */

	kirkwood_clk_init();



	/* internal devices that every board has */

	kirkwood_wdt_init();

	kirkwood_xor0_init();