aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorAnand Gadiyar <gadiyar@ti.com>2011-03-01 16:12:55 -0500
committerTony Lindgren <tony@atomide.com>2011-03-01 16:12:55 -0500
commite08016d0f4fcfe038a402071ada3073c6ca8d62d (patch)
treeaa768779182f9399de7c679c674d850e15bfd3d0 /arch/arm/plat-omap
parentaca6ad073ea820776bf5bdb87cf82eace35042c8 (diff)
omap: mmc: split out init for 2420
The MMC controller on the OMAP2420 is different from those on the OMAP2430, OMAP3 and OMAP4 families - all of the latter are identical. The one on the OMAP2420 is closer to that on OMAP1 chips. Currently, the n8x0 is the only OMAP2420 platform supported in mainline which registers the MMC controller. Upcoming changes to register the controllers using hwmod data are potentially invasive. To reduce the risk, separate out the 2420 controller registration from the common init function and update its only user. Also seperating out mux settings for OMAP2420. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Madhusudhan Chikkature <madhu.cr@ti.com> Cc: Chris Ball <cjb@laptop.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/mmc.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h
index f57f36abb07e..e5de5d452b3e 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -159,6 +159,7 @@ extern void omap_mmc_notify_cover_event(struct device *dev, int slot,
159 defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) 159 defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
160void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 160void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
161 int nr_controllers); 161 int nr_controllers);
162void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data);
162void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, 163void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
163 int nr_controllers); 164 int nr_controllers);
164int omap_mmc_add(const char *name, int id, unsigned long base, 165int omap_mmc_add(const char *name, int id, unsigned long base,
@@ -169,6 +170,9 @@ static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
169 int nr_controllers) 170 int nr_controllers)
170{ 171{
171} 172}
173static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data)
174{
175}
172static inline void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, 176static inline void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
173 int nr_controllers) 177 int nr_controllers)
174{ 178{