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

Commit 82e9bd58 authored by Paul Walmsley's avatar Paul Walmsley Committed by paul
Browse files

OMAP3 clock: convert clock34xx.h to clock34xx_data.c 

The OMAP3 clock code currently #includes a large .h file full of static
data structures.  Instead, define the data in a .c file.

Russell King <linux@arm.linux.org.uk> proposed this new arrangement:

    http://marc.info/?l=linux-omap&m=125967425908895&w=2



Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Russell King <linux@arm.linux.org.uk>
parent 75d43340

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ obj-$(CONFIG_ARCH_OMAP4) += cm4xxx.o 


# Clock framework

obj-$(CONFIG_ARCH_OMAP2)		+= clock24xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clock34xx_data.o



# EMU peripherals

obj-$(CONFIG_OMAP3_EMU)		+= emu.o

arch/arm/mach-omap2/clock.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ extern const struct clkops clkops_omap2_dflt; 


extern u8 cpu_mask;



extern struct clk_functions omap2_clk_functions;



/* clksel_rate data common to 24xx/343x */

static const struct clksel_rate gpt_32k_rates[] = {

	 { .div = 1, .val = 0, .flags = RATE_IN_24XX | RATE_IN_343X | DEFAULT_RATE },

arch/arm/mach-omap2/clock24xx.c

+2 −19
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <plat/clock.h>

#include <plat/sram.h>

#include <plat/prcm.h>

#include <plat/clkdev_omap.h>

#include <asm/div64.h>

#include <asm/clkdev.h>
@@ -59,24 +60,6 @@ static const struct clkops clkops_omap2430_i2chs_wait = { 


#include "clock24xx.h"



struct omap_clk {

	u32		cpu;

	struct clk_lookup lk;

};



#define CLK(dev, con, ck, cp) 		\

	{				\

		 .cpu = cp,		\

		.lk = {			\

			.dev_id = dev,	\

			.con_id = con,	\

			.clk = ck,	\

		},			\

	}



#define CK_243X			RATE_IN_243X

#define CK_242X			RATE_IN_242X



static struct omap_clk omap24xx_clks[] = {

	/* external root sources */

	CLK(NULL,	"func_32k_ck",	&func_32k_ck,	CK_243X | CK_242X),
@@ -658,7 +641,7 @@ void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) 
}

#endif



static struct clk_functions omap2_clk_functions = {

struct clk_functions omap2_clk_functions = {

	.clk_enable		= omap2_clk_enable,

	.clk_disable		= omap2_clk_disable,

	.clk_round_rate		= omap2_clk_round_rate,

arch/arm/mach-omap2/clock34xx.c

+66 −386

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/clock34xx.h

+21 −2979

File changed.

Preview size limit exceeded, changes collapsed.