From 3b11c54bd34add8cf60d9a172a9fcb886e7d73be Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Sat, 22 Sep 2012 02:24:14 -0600
Subject: [PATCH] --- yaml --- r: 331283 b: refs/heads/master c:
 c810fde217fcaf225e7693887a1ef955a1c86097 h: refs/heads/master i:   331281:
 1bc6c12ff52a641b4ef190481efc2bb16a161aa0   331279:
 b1c700869f46aeface2a6c5711ba746951fc9dbf v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-omap2/clock2420_data.c | 1 +
 trunk/arch/arm/mach-omap2/clock2430_data.c | 1 +
 trunk/arch/arm/mach-omap2/clock3xxx_data.c | 1 +
 trunk/arch/arm/mach-omap2/clock44xx_data.c | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3477f3177c77..111e94a89313 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fde3afbfae8e8469d8a484115715353b62e83e8
+refs/heads/master: c810fde217fcaf225e7693887a1ef955a1c86097
diff --git a/trunk/arch/arm/mach-omap2/clock2420_data.c b/trunk/arch/arm/mach-omap2/clock2420_data.c
index 51098a41d144..8c3bd2a62881 100644
--- a/trunk/arch/arm/mach-omap2/clock2420_data.c
+++ b/trunk/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/trunk/arch/arm/mach-omap2/clock2430_data.c b/trunk/arch/arm/mach-omap2/clock2430_data.c
index 7ea91398217a..0c8503d7033f 100644
--- a/trunk/arch/arm/mach-omap2/clock2430_data.c
+++ b/trunk/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/trunk/arch/arm/mach-omap2/clock3xxx_data.c b/trunk/arch/arm/mach-omap2/clock3xxx_data.c
index fc7dded4f3ef..f1ee4ec53d4a 100644
--- a/trunk/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/trunk/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/trunk/arch/arm/mach-omap2/clock44xx_data.c b/trunk/arch/arm/mach-omap2/clock44xx_data.c
index 77ff033b9ba0..a8454ba4b722 100644
--- a/trunk/arch/arm/mach-omap2/clock44xx_data.c
+++ b/trunk/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)