diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-25 05:53:03 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-25 05:53:03 +0100 |
| commit | b610ec502376d915b76a62e22576c5d0462cc9c9 (patch) | |
| tree | 55206c47da1f010588964edafe09284fce704b63 /arch/arm/mach-omap2/id.c | |
| parent | Merge branch 'pm-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/khi... (diff) | |
| parent | OMAP4: clock: Remove clock hacks from timer-gp.c (diff) | |
| download | linux-b610ec502376d915b76a62e22576c5d0462cc9c9.tar.xz linux-b610ec502376d915b76a62e22576c5d0462cc9c9.zip | |
Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index e73f7e4ffdcf..37b8a1a4adf8 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -177,6 +177,8 @@ void __init omap3_check_features(void) OMAP3_CHECK_FEATURE(status, SGX); OMAP3_CHECK_FEATURE(status, NEON); OMAP3_CHECK_FEATURE(status, ISP); + if (cpu_is_omap3630()) + omap3_features |= OMAP3_HAS_192MHZ_CLK; /* * TODO: Get additional info (where applicable) @@ -361,6 +363,7 @@ void __init omap3_cpuinfo(void) OMAP3_SHOW_FEATURE(sgx); OMAP3_SHOW_FEATURE(neon); OMAP3_SHOW_FEATURE(isp); + OMAP3_SHOW_FEATURE(192mhz_clk); printk(")\n"); } |