Remove extra code in arch/arm/*omap* to move it into omap-pool branch

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / board.h

diff --git a/arch/arm/plat-omap/include/mach/board.h b/arch/arm/plat-omap/include/mach/board.h
index ae8c2db22eb51786222be2a93ff2e31eb39c5b33..50ea79a0efa258b807b793c6cf58733fcb1b236c 100644 (file)
--- a/arch/arm/plat-omap/include/mach/board.h
+++ b/arch/arm/plat-omap/include/mach/board.h
@@ -23,12 +23,9 @@
 #define OMAP_TAG_FBMEM         0x4f08
 #define OMAP_TAG_STI_CONSOLE   0x4f09
 #define OMAP_TAG_CAMERA_SENSOR 0x4f0a
-#define OMAP_TAG_PARTITION      0x4f0b
-#define OMAP_TAG_TEA5761       0x4f10
-#define OMAP_TAG_TMP105                0x4f11
 
 #define OMAP_TAG_BOOT_REASON    0x4f80
-#define OMAP_TAG_FLASH_PART_STR        0x4f81
+#define OMAP_TAG_FLASH_PART    0x4f81
 #define OMAP_TAG_VERSION_STR   0x4f82
 
 struct omap_clock_config {
@@ -46,6 +43,12 @@ struct omap_sti_console_config {
        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)
@@ -105,9 +108,9 @@ struct omap_pwm_led_platform_data {
 struct omap_gpio_switch_config {
        char name[12];
        u16 gpio;
-       u8 flags:4;
-       u8 type:4;
-       unsigned int key_code:24; /* Linux key code */
+       int flags:4;
+       int type:4;
+       int key_code:24; /* Linux key code */
 };
 
 struct omap_uart_config {
@@ -115,25 +118,8 @@ struct omap_uart_config {
        unsigned int enabled_uarts;
 };
 
-struct omap_tea5761_config {
-       u16 enable_gpio;
-};
-
-/* This cannot be passed from the bootloader */
-struct omap_tmp105_config {
-       u16 tmp105_irq_pin;
-       int (* set_power)(int enable);
-};
-
-struct omap_partition_config {
-       char name[16];
-       unsigned int size;
-       unsigned int offset;
-       /* same as in include/linux/mtd/partitions.h */
-       unsigned int mask_flags;
-};
 
-struct omap_flash_part_str_config {
+struct omap_flash_part_config {
        char part_table[0];
 };