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: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Kevin Hilman <khilman@ti.com>

diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c
index 51098a41d14452946b8d8e304e693f0b4bbbe7e8..8c3bd2a628814e539a96a5fb0fbde38f74f08737 100644 (file)
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -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),
 };
 
 /*

diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c
index 7ea91398217af0ac65b8137438061d63278399e9..0c8503d7033fcb286642a402c7b0c423ce2b2c03 100644 (file)
--- a/arch/arm/mach-omap2/clock2430_data.c
+++ b/arch/arm/mach-omap2/clock2430_data.c
@@ -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),
 };
 
 /*

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index fc7dded4f3ef37ec8370b5e9c4e0d2c73722a03a..f1ee4ec53d4afbaba1fb34ae9203abbae8f88c43 100644 (file)
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -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),
 };
 
 

diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index 77ff033b9ba0a04a321f3f8ab22654226c8d233e..a8454ba4b722528a8191f223b3391dc766c36082 100644 (file)
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -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)