diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:00:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:00:53 -0700 |
commit | 1077682b2f97cee76a79cf38bab3fa022a97d9f8 (patch) | |
tree | e0e7dff35e3f38b9e360e702903e132c991f3f22 /include/asm-arm/arch-omap/board.h | |
parent | dc9ca2af4917ce4e545fa3eb1d845c555128cabc (diff) | |
parent | bafa49cc1b800df4748b29e2b038ff029d7c8747 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-omap/board.h')
-rw-r--r-- | include/asm-arm/arch-omap/board.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h index 95bd625480c..a0040cd8663 100644 --- a/include/asm-arm/arch-omap/board.h +++ b/include/asm-arm/arch-omap/board.h @@ -30,10 +30,23 @@ struct omap_clock_config { u8 system_clock_type; }; +struct omap_mmc_conf { + unsigned enabled:1; + /* nomux means "standard" muxing is wrong on this board, and that + * board-specific code handled it before common init logic. + */ + unsigned nomux:1; + /* switch pin can be for card detect (default) or card cover */ + unsigned cover:1; + /* 4 wire signaling is optional, and is only used for SD/SDIO */ + unsigned wire4:1; + s16 power_pin; + s16 switch_pin; + s16 wp_pin; +}; + struct omap_mmc_config { - u8 mmc_blocks; - s16 mmc1_power_pin, mmc2_power_pin; - s16 mmc1_switch_pin, mmc2_switch_pin; + struct omap_mmc_conf mmc[2]; }; struct omap_serial_console_config { |