diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/plat-omap | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 25232b281e1e..ed94dee326ca 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
| @@ -313,19 +313,6 @@ static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf) | |||
| 313 | omap_cfg_reg(MMC_DAT3); | 313 | omap_cfg_reg(MMC_DAT3); |
| 314 | } | 314 | } |
| 315 | } | 315 | } |
| 316 | #if defined(CONFIG_ARCH_OMAP2420) | ||
| 317 | if (mmc_conf->mmc[0].internal_clock) { | ||
| 318 | /* | ||
| 319 | * Use internal loop-back in MMC/SDIO | ||
| 320 | * Module Input Clock selection | ||
| 321 | */ | ||
| 322 | if (cpu_is_omap24xx()) { | ||
| 323 | u32 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); | ||
| 324 | v |= (1 << 24); /* not used in 243x */ | ||
| 325 | omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); | ||
| 326 | } | ||
| 327 | } | ||
| 328 | #endif | ||
| 329 | } | 316 | } |
| 330 | 317 | ||
| 331 | #ifdef CONFIG_ARCH_OMAP16XX | 318 | #ifdef CONFIG_ARCH_OMAP16XX |