git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[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
a0040cd
..
edf1dc6
100644
(file)
--- a/
include/asm-arm/arch-omap/board.h
+++ b/
include/asm-arm/arch-omap/board.h
@@
-10,7
+10,6
@@
#ifndef _OMAP_BOARD_H
#define _OMAP_BOARD_H
#ifndef _OMAP_BOARD_H
#define _OMAP_BOARD_H
-#include <linux/config.h>
#include <linux/types.h>
/* Different peripheral ids */
#include <linux/types.h>
/* Different peripheral ids */
@@
-21,9
+20,13
@@
#define OMAP_TAG_LCD 0x4f05
#define OMAP_TAG_GPIO_SWITCH 0x4f06
#define OMAP_TAG_UART 0x4f07
#define OMAP_TAG_LCD 0x4f05
#define OMAP_TAG_GPIO_SWITCH 0x4f06
#define OMAP_TAG_UART 0x4f07
+#define OMAP_TAG_FBMEM 0x4f08
+#define OMAP_TAG_STI_CONSOLE 0x4f09
+#define OMAP_TAG_CAMERA_SENSOR 0x4f0a
#define OMAP_TAG_BOOT_REASON 0x4f80
#define OMAP_TAG_FLASH_PART 0x4f81
#define OMAP_TAG_BOOT_REASON 0x4f80
#define OMAP_TAG_FLASH_PART 0x4f81
+#define OMAP_TAG_VERSION_STR 0x4f82
struct omap_clock_config {
/* 0 for 12 MHz, 1 for 13 MHz and 2 for 19.2 MHz */
struct omap_clock_config {
/* 0 for 12 MHz, 1 for 13 MHz and 2 for 19.2 MHz */
@@
-54,6
+57,17
@@
struct omap_serial_console_config {
u32 console_speed;
};
u32 console_speed;
};
+struct omap_sti_console_config {
+ unsigned enable:1;
+ u8 channel;
+};
+
+struct omap_camera_sensor_config {
+ u16 reset_gpio;
+ int (*power_on)(void * data);
+ int (*power_off)(void * data);
+};
+
struct omap_usb_config {
/* Configure drivers according to the connectors on your board:
* - "A" connector (rectagular)
struct omap_usb_config {
/* Configure drivers according to the connectors on your board:
* - "A" connector (rectagular)
@@
-87,6
+101,13
@@
struct omap_lcd_config {
char ctrl_name[16];
};
char ctrl_name[16];
};
+struct omap_fbmem_config {
+ u32 fb_sram_start;
+ u32 fb_sram_size;
+ u32 fb_sdram_start;
+ u32 fb_sdram_size;
+};
+
/* Cover:
* high -> closed
* low -> open
/* Cover:
* high -> closed
* low -> open
@@
-106,6
+127,12
@@
struct omap_gpio_switch_config {
int key_code:24; /* Linux key code */
};
int key_code:24; /* Linux key code */
};
+struct omap_uart_config {
+ /* Bit field of UARTs present; bit 0 --> UART1 */
+ unsigned int enabled_uarts;
+};
+
+
struct omap_flash_part_config {
char part_table[0];
};
struct omap_flash_part_config {
char part_table[0];
};
@@
-114,11
+141,14
@@
struct omap_boot_reason_config {
char reason_str[12];
};
char reason_str[12];
};
-struct omap_
uart
_config {
- /* Bit field of UARTs present; bit 0 --> UART1 */
-
unsigned int enabled_uarts
;
+struct omap_
version
_config {
+ char component[12];
+
char version[12]
;
};
};
+
+#include <asm-arm/arch-omap/board-nokia.h>
+
struct omap_board_config_entry {
u16 tag;
u16 len;
struct omap_board_config_entry {
u16 tag;
u16 len;