Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[pandora-kernel.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 3d65c50..37b8a1a 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -57,6 +57,8 @@ int omap_type(void)
                val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
        } else if (cpu_is_omap34xx()) {
                val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
+       } else if (cpu_is_omap44xx()) {
+               val = omap_ctrl_readl(OMAP44XX_CONTROL_STATUS);
        } else {
                pr_err("Cannot detect omap type!\n");
                goto out;
@@ -175,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)
@@ -281,6 +285,7 @@ void __init omap4_check_revision(void)
 
        if ((hawkeye == 0xb852) && (rev == 0x0)) {
                omap_revision = OMAP4430_REV_ES1_0;
+               omap_chip.oc |= CHIP_IS_OMAP4430ES1;
                pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
                return;
        }
@@ -358,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");
 }