omap: Keep nwires for omap1 and 2420 MMC controller

A patch from Sukumar Ghorai <s-ghorai@ti.com> changed the
nwires to use caps instead. However, nwires is still
needed for the earlier controller.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Sukumar Ghorai <s-ghorai@ti.com>
Signed-off-by: Ming Lei <tom.leiming@gmail.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 7a93bd5b24c5..8fd226989b25 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -488,7 +488,7 @@ static struct omap_mmc_platform_data mmc1_data = {
         .max_freq                       = 24000000,
         .dma_mask                       = 0xffffffff,
         .slots[0] = {
-                .caps                   = MMC_CAP_4_BIT_DATA,
+                .wires                  = 4,
                 .set_power              = n8x0_mmc_set_power,
                 .set_bus_mode           = n8x0_mmc_set_bus_mode,
                 .get_cover_state        = n8x0_mmc_get_cover_state,
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h
index 4f819fc261b7..c5f35f87deaa 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -73,9 +73,12 @@ struct omap_mmc_platform_data {
 
         struct omap_mmc_slot_data {
 
-                /* 4/8 wires and any additional host capabilities
-                 * need to OR'd all capabilities (ref. linux/mmc/host.h) */
-                u32 caps;
+                /*
+                 * 4/8 wires and any additional host capabilities
+                 * need to OR'd all capabilities (ref. linux/mmc/host.h)
+                 */
+                u8  wires;      /* Used for the MMC driver on omap1 and 2420 */
+                u32 caps;       /* Used for the MMC driver on 2430 and later */
 
                 /*
                  * nomux means "standard" muxing is wrong on this board, and