vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / mach-omap / ocpi.c

diff --git a/arch/arm/mach-omap/ocpi.c b/arch/arm/mach-omap/ocpi.c
index e7087bc..e27041f 100644 (file)
--- a/arch/arm/mach-omap/ocpi.c
+++ b/arch/arm/mach-omap/ocpi.c
@@ -59,20 +59,12 @@ int ocpi_enable(void)
 
        /* Make sure there's clock for OCPI */
 
-#ifdef CONFIG_ARCH_OMAP1610
-        if (cpu_is_omap1610()) {
-               val = omap_readl(OMAP1610_ARM_IDLECT3);
+#if defined(CONFIG_ARCH_OMAP16XX)
+        if (cpu_is_omap1610() || cpu_is_omap1710()) {
+               val = omap_readl(OMAP16XX_ARM_IDLECT3);
                val |= EN_OCPI_CK;
                val &= ~IDLOCPI_ARM;
-               omap_writel(val, OMAP1610_ARM_IDLECT3);
-        }
-#endif
-#ifdef CONFIG_ARCH_OMAP5912
-        if (cpu_is_omap5912()) {
-               val = omap_readl(OMAP5912_ARM_IDLECT3);
-               val |= EN_OCPI_CK;
-               val &= ~IDLOCPI_ARM;
-               omap_writel(val, OMAP5912_ARM_IDLECT3);
+               omap_writel(val, OMAP16XX_ARM_IDLECT3);
         }
 #endif
        /* Enable access for OHCI in OCPI */
@@ -85,14 +77,6 @@ int ocpi_enable(void)
        val &= ~0xff;
        omap_writel(val, OCPI_SEC);
 
-       val = omap_readl(OCPI_SEC);
-       val |= 0;
-       omap_writel(val, OCPI_SEC);
-
-       val = omap_readl(OCPI_SINT0);
-       val |= 0;
-       omap_writel(val, OCPI_SINT1);
-
        return 0;
 }
 EXPORT_SYMBOL(ocpi_enable);