xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 's3c-move' into devel

Browse Source 
Conflicts:

	arch/arm/mach-versatile/core.c
This commit is contained in:
Russell King
2008-10-14 22:24:51 +01:00
committed by Russell King
parent b6825d2df5 d5120ae72a
commit 7e69a8c4d0
413 changed files with 3568 additions and 2366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/plat-omap/devices.c
View File

@@ -313,19 +313,6 @@ static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf)
omap_cfg_reg(MMC_DAT3);
}
}
#if defined(CONFIG_ARCH_OMAP2420)
if (mmc_conf->mmc[0].internal_clock) {
/*
* Use internal loop-back in MMC/SDIO
* Module Input Clock selection
*/
if (cpu_is_omap24xx()) {
u32 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
v |= (1 << 24); /* not used in 243x */
omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
}
}
#endif
}
#ifdef CONFIG_ARCH_OMAP16XX