diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-10 21:57:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-10 21:57:49 +0200 |
| commit | 5c23804a0941a111752fdacefe0bea2db1b4d93f (patch) | |
| tree | 482436cd247783c7df3d522fdc4ee51e2b3e87dc /include/asm-arm/arch-omap/board.h | |
| parent | [PATCH] remove asm-xtensa/ipc.h (diff) | |
| parent | [PATCH] ARM: 2803/1: OMAP update 11/11: Add cpufreq support (diff) | |
| download | linux-5c23804a0941a111752fdacefe0bea2db1b4d93f.tar.xz linux-5c23804a0941a111752fdacefe0bea2db1b4d93f.zip | |
Merge master.kernel.org:~rmk/linux-2.6-arm.git
Diffstat (limited to 'include/asm-arm/arch-omap/board.h')
| -rw-r--r-- | include/asm-arm/arch-omap/board.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h index 1cefd60b6f2a..95bd625480c1 100644 --- a/include/asm-arm/arch-omap/board.h +++ b/include/asm-arm/arch-omap/board.h @@ -16,10 +16,11 @@ /* Different peripheral ids */ #define OMAP_TAG_CLOCK 0x4f01 #define OMAP_TAG_MMC 0x4f02 -#define OMAP_TAG_UART 0x4f03 +#define OMAP_TAG_SERIAL_CONSOLE 0x4f03 #define OMAP_TAG_USB 0x4f04 #define OMAP_TAG_LCD 0x4f05 #define OMAP_TAG_GPIO_SWITCH 0x4f06 +#define OMAP_TAG_UART 0x4f07 #define OMAP_TAG_BOOT_REASON 0x4f80 #define OMAP_TAG_FLASH_PART 0x4f81 @@ -35,7 +36,7 @@ struct omap_mmc_config { s16 mmc1_switch_pin, mmc2_switch_pin; }; -struct omap_uart_config { +struct omap_serial_console_config { u8 console_uart; u32 console_speed; }; @@ -82,7 +83,8 @@ struct omap_lcd_config { */ #define OMAP_GPIO_SWITCH_TYPE_COVER 0x0000 #define OMAP_GPIO_SWITCH_TYPE_CONNECTION 0x0001 -#define OMAP_GPIO_SWITCH_FLAG_INVERTED 0x0001 +#define OMAP_GPIO_SWITCH_FLAG_INVERTED 0x0001 +#define OMAP_GPIO_SWITCH_FLAG_OUTPUT 0x0002 struct omap_gpio_switch_config { char name[12]; u16 gpio; @@ -99,6 +101,10 @@ struct omap_boot_reason_config { char reason_str[12]; }; +struct omap_uart_config { + /* Bit field of UARTs present; bit 0 --> UART1 */ + unsigned int enabled_uarts; +}; struct omap_board_config_entry { u16 tag; |