This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-arm / arch-omap / board.h

diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h
index 1cefd60..a241935 100644 (file)
--- a/include/asm-arm/arch-omap/board.h
+++ b/include/asm-arm/arch-omap/board.h
@@ -17,12 +17,7 @@
 #define OMAP_TAG_CLOCK         0x4f01
 #define OMAP_TAG_MMC           0x4f02
 #define OMAP_TAG_UART          0x4f03
-#define OMAP_TAG_USB           0x4f04
-#define OMAP_TAG_LCD           0x4f05
-#define OMAP_TAG_GPIO_SWITCH   0x4f06
-
-#define OMAP_TAG_BOOT_REASON    0x4f80
-#define OMAP_TAG_FLASH_PART    0x4f81
+#define OMAP_TAG_USB            0x4f04
 
 struct omap_clock_config {
        /* 0 for 12 MHz, 1 for 13 MHz and 2 for 19.2 MHz */
@@ -31,8 +26,8 @@ struct omap_clock_config {
 
 struct omap_mmc_config {
        u8 mmc_blocks;
-       s16 mmc1_power_pin, mmc2_power_pin;
-       s16 mmc1_switch_pin, mmc2_switch_pin;
+       s8 mmc1_power_pin, mmc2_power_pin;
+       s8 mmc1_switch_pin, mmc2_switch_pin;
 };
 
 struct omap_uart_config {
@@ -68,38 +63,6 @@ struct omap_usb_config {
        u8              pins[3];
 };
 
-struct omap_lcd_config {
-       char panel_name[16];
-       char ctrl_name[16];
-};
-
-/* Cover:
- *      high -> closed
- *      low  -> open
- * Connection:
- *      high -> connected
- *      low  -> disconnected
- */
-#define OMAP_GPIO_SWITCH_TYPE_COVER            0x0000
-#define OMAP_GPIO_SWITCH_TYPE_CONNECTION       0x0001
-#define OMAP_GPIO_SWITCH_FLAG_INVERTED          0x0001
-struct omap_gpio_switch_config {
-       char name[12];
-       u16 gpio;
-       int flags:4;
-       int type:4;
-       int key_code:24; /* Linux key code */
-};
-
-struct omap_flash_part_config {
-       char part_table[0];
-};
-
-struct omap_boot_reason_config {
-       char reason_str[12];
-};
-
-
 struct omap_board_config_entry {
        u16 tag;
        u16 len;
@@ -111,14 +74,10 @@ struct omap_board_config_kernel {
        const void *data;
 };
 
-extern const void *__omap_get_config(u16 tag, size_t len, int nr);
+extern const void *__omap_get_config(u16 tag, size_t len);
 
 #define omap_get_config(tag, type) \
-       ((const type *) __omap_get_config((tag), sizeof(type), 0))
-#define omap_get_nr_config(tag, type, nr) \
-       ((const type *) __omap_get_config((tag), sizeof(type), (nr)))
-
-extern const void *omap_get_var_config(u16 tag, size_t *len);
+       ((const type *) __omap_get_config((tag), sizeof(type)))
 
 extern struct omap_board_config_kernel *omap_board_config;
 extern int omap_board_config_size;