omap mmc: Add low-level initialization for hsmmc controller

Add low-level initialization for hsmmc controller. Merged into
this patch patch are various improvments and board support by
Grazvydas Ignotas and David Brownell.

Also change wire4 to be wires, as some newer controllers support
8 data lines.

Cc: Pierre Ossman <drzeus-mmc@drzeus.cx>
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 8ccdfcf2942c..6e03272b0521 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -19,6 +19,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
+#include <mach/control.h>
 #include <mach/tc.h>
 #include <mach/board.h>
 #include <mach/mux.h>
@@ -311,7 +312,7 @@ static inline void omap2_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
                 omap_cfg_reg(F20_24XX_MMC_DAT0);
                 omap_cfg_reg(F19_24XX_MMC_DAT_DIR0);
                 omap_cfg_reg(G18_24XX_MMC_CMD_DIR);
-                if (mmc_controller->slots[0].wire4) {
+                if (mmc_controller->slots[0].wires == 4) {
                         omap_cfg_reg(H14_24XX_MMC_DAT1);
                         omap_cfg_reg(E19_24XX_MMC_DAT2);
                         omap_cfg_reg(D19_24XX_MMC_DAT3);