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

Commit f9a6aa43 authored by Linus Walleij's avatar Linus Walleij Committed by Mike Turquette
Browse files

clk: convert ARM RealView to common clk 



This converts the ARM RealView machine over to using the common
clock. The approach is similar to the one used for the Integrator,
and we're reusing the ICST wrapper code.

We have to put the clock intialization in the timer init function
for the clocks to be available when initializing the timer,
keeping them in early_init() is too early for the common clk.

Since we now have to go down and compile drivers/clk/versatile
a CONFIG_COMMON_CLK_VERSATILE symbol has been added so the proper
code gets compiled into the kernel for either machine. A leftover
CLK_VERSATILE in the Integrator Kconfig was fixed up to use
the new symbol as well.

Tested on ARM RealView PB1176.

Cc: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent bc0e489e

arch/arm/Kconfig

+3 −4
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ config ARCH_INTEGRATOR 
	select ARM_AMBA

	select ARCH_HAS_CPUFREQ

	select COMMON_CLK

	select CLK_VERSATILE

	select COMMON_CLK_VERSATILE

	select HAVE_TCM

	select ICST

	select GENERIC_CLOCKEVENTS
@@ -289,13 +289,12 @@ config ARCH_INTEGRATOR 
config ARCH_REALVIEW

	bool "ARM Ltd. RealView family"

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select COMMON_CLK

	select COMMON_CLK_VERSATILE

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLOCK

	select PLAT_VERSATILE_CLCD

	select ARM_TIMER_SP804

	select GPIO_PL061 if GPIOLIB

arch/arm/mach-realview/core.c

+0 −106
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/ata_platform.h>

#include <linux/amba/mmci.h>

#include <linux/gfp.h>

#include <linux/clkdev.h>

#include <linux/mtd/physmap.h>



#include <mach/hardware.h>
@@ -226,115 +225,10 @@ struct mmci_platform_data realview_mmc1_plat_data = { 
	.cd_invert	= true,

};



/*

 * Clock handling

 */

static const struct icst_params realview_oscvco_params = {

	.ref		= 24000000,

	.vco_max	= ICST307_VCO_MAX,

	.vco_min	= ICST307_VCO_MIN,

	.vd_min		= 4 + 8,

	.vd_max		= 511 + 8,

	.rd_min		= 1 + 2,

	.rd_max		= 127 + 2,

	.s2div		= icst307_s2div,

	.idx2s		= icst307_idx2s,

};



static void realview_oscvco_set(struct clk *clk, struct icst_vco vco)

{

	void __iomem *sys_lock = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LOCK_OFFSET;

	u32 val;



	val = readl(clk->vcoreg) & ~0x7ffff;

	val |= vco.v | (vco.r << 9) | (vco.s << 16);



	writel(0xa05f, sys_lock);

	writel(val, clk->vcoreg);

	writel(0, sys_lock);

}



static const struct clk_ops oscvco_clk_ops = {

	.round	= icst_clk_round,

	.set	= icst_clk_set,

	.setvco	= realview_oscvco_set,

};



static struct clk oscvco_clk = {

	.ops	= &oscvco_clk_ops,

	.params	= &realview_oscvco_params,

};



/*

 * These are fixed clocks.

 */

static struct clk ref24_clk = {

	.rate	= 24000000,

};



static struct clk sp804_clk = {

	.rate	= 1000000,

};



static struct clk dummy_apb_pclk;



static struct clk_lookup lookups[] = {

	{	/* Bus clock */

		.con_id		= "apb_pclk",

		.clk		= &dummy_apb_pclk,

	}, {	/* UART0 */

		.dev_id		= "dev:uart0",

		.clk		= &ref24_clk,

	}, {	/* UART1 */

		.dev_id		= "dev:uart1",

		.clk		= &ref24_clk,

	}, {	/* UART2 */

		.dev_id		= "dev:uart2",

		.clk		= &ref24_clk,

	}, {	/* UART3 */

		.dev_id		= "fpga:uart3",

		.clk		= &ref24_clk,

	}, {	/* UART3 is on the dev chip in PB1176 */

		.dev_id		= "dev:uart3",

		.clk		= &ref24_clk,

	}, {	/* UART4 only exists in PB1176 */

		.dev_id		= "fpga:uart4",

		.clk		= &ref24_clk,

	}, {	/* KMI0 */

		.dev_id		= "fpga:kmi0",

		.clk		= &ref24_clk,

	}, {	/* KMI1 */

		.dev_id		= "fpga:kmi1",

		.clk		= &ref24_clk,

	}, {	/* MMC0 */

		.dev_id		= "fpga:mmc0",

		.clk		= &ref24_clk,

	}, {	/* CLCD is in the PB1176 and EB DevChip */

		.dev_id		= "dev:clcd",

		.clk		= &oscvco_clk,

	}, {	/* PB:CLCD */

		.dev_id		= "issp:clcd",

		.clk		= &oscvco_clk,

	}, {	/* SSP */

		.dev_id		= "dev:ssp0",

		.clk		= &ref24_clk,

	}, {	/* SP804 timers */

		.dev_id		= "sp804",

		.clk		= &sp804_clk,

	},

};



void __init realview_init_early(void)

{

	void __iomem *sys = __io_address(REALVIEW_SYS_BASE);



	if (machine_is_realview_pb1176())

		oscvco_clk.vcoreg = sys + REALVIEW_SYS_OSC0_OFFSET;

	else

		oscvco_clk.vcoreg = sys + REALVIEW_SYS_OSC4_OFFSET;



	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	versatile_sched_clock_init(sys + REALVIEW_SYS_24MHz_OFFSET, 24000000);

}

arch/arm/mach-realview/include/mach/clkdev.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_CLKDEV_H

#define __ASM_MACH_CLKDEV_H



#include <plat/clock.h>



struct clk {

	unsigned long		rate;

	const struct clk_ops	*ops;

	const struct icst_params *params;

	void __iomem		*vcoreg;

};



#define __clk_get(clk) ({ 1; })

#define __clk_put(clk) do { } while (0)



#endif

arch/arm/mach-realview/realview_eb.c

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/amba/mmci.h>

#include <linux/amba/pl022.h>

#include <linux/io.h>

#include <linux/platform_data/clk-realview.h>



#include <mach/hardware.h>

#include <asm/irq.h>
@@ -414,6 +415,7 @@ static void __init realview_eb_timer_init(void) 
	else

		timer_irq = IRQ_EB_TIMER0_1;



	realview_clk_init(__io_address(REALVIEW_SYS_BASE), false);

	realview_timer_init(timer_irq);

	realview_eb_twd_init();

}

arch/arm/mach-realview/realview_pb1176.c

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

#include <linux/mtd/partitions.h>

#include <linux/io.h>

#include <linux/platform_data/clk-realview.h>



#include <mach/hardware.h>

#include <asm/irq.h>
@@ -326,6 +327,7 @@ static void __init realview_pb1176_timer_init(void) 
	timer2_va_base = __io_address(REALVIEW_PB1176_TIMER2_3_BASE);

	timer3_va_base = __io_address(REALVIEW_PB1176_TIMER2_3_BASE) + 0x20;



	realview_clk_init(__io_address(REALVIEW_SYS_BASE), true);

	realview_timer_init(IRQ_DC1176_TIMER0);

}