diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-04 16:58:01 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-04 16:58:01 -0700 |
| commit | 63509e3c03ae22000c642e33b5006769d1b5db86 (patch) | |
| tree | ff9b2eb58041c24af8610d0e07560c391addb544 /arch/arm/plat-omap/include/plat/mmc.h | |
| parent | 7ad0e386d46e9edff64705ab25337ad9130baf63 (diff) | |
| download | linux-stable-63509e3c03ae22000c642e33b5006769d1b5db86.tar.gz linux-stable-63509e3c03ae22000c642e33b5006769d1b5db86.tar.bz2 linux-stable-63509e3c03ae22000c642e33b5006769d1b5db86.zip | |
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>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/mmc.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 9 |
1 files changed, 6 insertions, 3 deletions
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 |