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

Commit c810fde2 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP2+: clock data: add some aliases for use by CPUFreq only 



These clkdev aliases should make it possible to remove the
cpu_is_omap*() calls and the omap_device*() call from
drivers/cpufreq/omap-cpufreq.c during the next merge window.  Those
are interfering with multi-subarch ARM kernels.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarKevin Hilman <khilman@ti.com>
parent 8fde3afb

arch/arm/mach-omap2/clock2420_data.c

+1 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,7 @@ static struct omap_clk omap2420_clks[] = { 
	CLK(NULL,	"timer_32k_ck",	&func_32k_ck,	CK_242X),

	CLK(NULL,	"timer_sys_ck",	&sys_ck,	CK_242X),

	CLK(NULL,	"timer_ext_ck",	&alt_ck,	CK_242X),

	CLK(NULL,	"cpufreq_ck",	&virt_prcm_set,	CK_242X),

};



/*

arch/arm/mach-omap2/clock2430_data.c

+1 −0
Original line number Diff line number Diff line
@@ -1994,6 +1994,7 @@ static struct omap_clk omap2430_clks[] = { 
	CLK(NULL,	"timer_32k_ck",  &func_32k_ck,   CK_243X),

	CLK(NULL,	"timer_sys_ck",	&sys_ck,	CK_243X),

	CLK(NULL,	"timer_ext_ck",	&alt_ck,	CK_243X),

	CLK(NULL,	"cpufreq_ck",	&virt_prcm_set,	CK_243X),

};



/*

arch/arm/mach-omap2/clock3xxx_data.c

+1 −0
Original line number Diff line number Diff line
@@ -3470,6 +3470,7 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"uart4_ick",	&uart4_ick_am35xx,	CK_AM35XX),

	CLK(NULL,	"timer_32k_ck",	&omap_32k_fck,  CK_3XXX),

	CLK(NULL,	"timer_sys_ck",	&sys_ck,	CK_3XXX),

	CLK(NULL,	"cpufreq_ck",	&dpll1_ck,	CK_3XXX),

};

arch/arm/mach-omap2/clock44xx_data.c

+1 −0
Original line number Diff line number Diff line
@@ -3327,6 +3327,7 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK("omap_timer.6",	"timer_sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK("omap_timer.7",	"timer_sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK("omap_timer.8",	"timer_sys_ck",	&syc_clk_div_ck,	CK_443X),

	CLK(NULL,	"cpufreq_ck",	&dpll_mpu_ck,	CK_443X),

};



int __init omap4xxx_clk_init(void)