git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
93c7f4a
..
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 */
/* Make sure there's clock for OCPI */
-#if defined(CONFIG_ARCH_OMAP16
10) || defined(CONFIG_ARCH_OMAP1710
)
+#if defined(CONFIG_ARCH_OMAP16
XX
)
if (cpu_is_omap1610() || cpu_is_omap1710()) {
if (cpu_is_omap1610() || cpu_is_omap1710()) {
- val = omap_readl(OMAP16
10
_ARM_IDLECT3);
+ val = omap_readl(OMAP16
XX
_ARM_IDLECT3);
val |= EN_OCPI_CK;
val &= ~IDLOCPI_ARM;
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 */
}
#endif
/* Enable access for OHCI in OCPI */