diff options
author | Igor Grinberg <grinberg@compulab.co.il> | 2012-08-28 19:18:53 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-10 19:33:59 -0400 |
commit | 3927b3f78c46001a8bd268f901c7e54863c66726 (patch) | |
tree | 09cd87ebe0617ed5aae45154e1672826e75d7782 /arch/arm/plat-omap | |
parent | 8aa8a9037a814b3006fb87cc03d925a96a197956 (diff) |
ARM: OMAP: remove the omap custom tags
The omap custom initialization tags are not used anymore (if ever)
by the mainline kernel.
Thus remove the omap custom initialization tags.
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/common.c | 34 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/board.h | 84 |
2 files changed, 0 insertions, 118 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index af98971d63d0..7c04748cb37f 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
@@ -24,40 +24,6 @@ | |||
24 | 24 | ||
25 | #include <plat/omap-secure.h> | 25 | #include <plat/omap-secure.h> |
26 | 26 | ||
27 | |||
28 | #define NO_LENGTH_CHECK 0xffffffff | ||
29 | |||
30 | struct omap_board_config_kernel *omap_board_config __initdata; | ||
31 | int omap_board_config_size; | ||
32 | |||
33 | static const void *__init get_config(u16 tag, size_t len, | ||
34 | int skip, size_t *len_out) | ||
35 | { | ||
36 | struct omap_board_config_kernel *kinfo = NULL; | ||
37 | int i; | ||
38 | |||
39 | /* Try to find the config from the board-specific structures | ||
40 | * in the kernel. */ | ||
41 | for (i = 0; i < omap_board_config_size; i++) { | ||
42 | if (omap_board_config[i].tag == tag) { | ||
43 | if (skip == 0) { | ||
44 | kinfo = &omap_board_config[i]; | ||
45 | break; | ||
46 | } else { | ||
47 | skip--; | ||
48 | } | ||
49 | } | ||
50 | } | ||
51 | if (kinfo == NULL) | ||
52 | return NULL; | ||
53 | return kinfo->data; | ||
54 | } | ||
55 | |||
56 | const void *__init __omap_get_config(u16 tag, size_t len, int nr) | ||
57 | { | ||
58 | return get_config(tag, len, nr, NULL); | ||
59 | } | ||
60 | |||
61 | void __init omap_reserve(void) | 27 | void __init omap_reserve(void) |
62 | { | 28 | { |
63 | omap_vram_reserve_sdram_memblock(); | 29 | omap_vram_reserve_sdram_memblock(); |
diff --git a/arch/arm/plat-omap/include/plat/board.h b/arch/arm/plat-omap/include/plat/board.h index db3bdc120a6e..5938c729b6c0 100644 --- a/arch/arm/plat-omap/include/plat/board.h +++ b/arch/arm/plat-omap/include/plat/board.h | |||
@@ -12,39 +12,6 @@ | |||
12 | 12 | ||
13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
14 | 14 | ||
15 | #include <plat/gpio-switch.h> | ||
16 | |||
17 | /* Different peripheral ids */ | ||
18 | #define OMAP_TAG_CLOCK 0x4f01 | ||
19 | #define OMAP_TAG_GPIO_SWITCH 0x4f06 | ||
20 | #define OMAP_TAG_STI_CONSOLE 0x4f09 | ||
21 | #define OMAP_TAG_CAMERA_SENSOR 0x4f0a | ||
22 | |||
23 | #define OMAP_TAG_BOOT_REASON 0x4f80 | ||
24 | #define OMAP_TAG_FLASH_PART 0x4f81 | ||
25 | #define OMAP_TAG_VERSION_STR 0x4f82 | ||
26 | |||
27 | struct omap_clock_config { | ||
28 | /* 0 for 12 MHz, 1 for 13 MHz and 2 for 19.2 MHz */ | ||
29 | u8 system_clock_type; | ||
30 | }; | ||
31 | |||
32 | struct omap_serial_console_config { | ||
33 | u8 console_uart; | ||
34 | u32 console_speed; | ||
35 | }; | ||
36 | |||
37 | struct omap_sti_console_config { | ||
38 | unsigned enable:1; | ||
39 | u8 channel; | ||
40 | }; | ||
41 | |||
42 | struct omap_camera_sensor_config { | ||
43 | u16 reset_gpio; | ||
44 | int (*power_on)(void * data); | ||
45 | int (*power_off)(void * data); | ||
46 | }; | ||
47 | |||
48 | struct omap_lcd_config { | 15 | struct omap_lcd_config { |
49 | char panel_name[16]; | 16 | char panel_name[16]; |
50 | char ctrl_name[16]; | 17 | char ctrl_name[16]; |
@@ -59,57 +26,6 @@ struct omap_backlight_config { | |||
59 | int (*set_power)(struct device *dev, int state); | 26 | int (*set_power)(struct device *dev, int state); |
60 | }; | 27 | }; |
61 | 28 | ||
62 | struct omap_fbmem_config { | ||
63 | u32 start; | ||
64 | u32 size; | ||
65 | }; | ||
66 | |||
67 | struct omap_pwm_led_platform_data { | ||
68 | const char *name; | ||
69 | int intensity_timer; | ||
70 | int blink_timer; | ||
71 | void (*set_power)(struct omap_pwm_led_platform_data *self, int on_off); | ||
72 | }; | ||
73 | |||
74 | struct omap_uart_config { | ||
75 | /* Bit field of UARTs present; bit 0 --> UART1 */ | ||
76 | unsigned int enabled_uarts; | ||
77 | }; | ||
78 | |||
79 | |||
80 | struct omap_flash_part_config { | ||
81 | char part_table[0]; | ||
82 | }; | ||
83 | |||
84 | struct omap_boot_reason_config { | ||
85 | char reason_str[12]; | ||
86 | }; | ||
87 | |||
88 | struct omap_version_config { | ||
89 | char component[12]; | ||
90 | char version[12]; | ||
91 | }; | ||
92 | |||
93 | struct omap_board_config_entry { | ||
94 | u16 tag; | ||
95 | u16 len; | ||
96 | u8 data[0]; | ||
97 | }; | ||
98 | |||
99 | struct omap_board_config_kernel { | ||
100 | u16 tag; | ||
101 | const void *data; | ||
102 | }; | ||
103 | |||
104 | extern const void *__init __omap_get_config(u16 tag, size_t len, int nr); | ||
105 | |||
106 | #define omap_get_config(tag, type) \ | ||
107 | ((const type *) __omap_get_config((tag), sizeof(type), 0)) | ||
108 | |||
109 | extern struct omap_board_config_kernel *omap_board_config; | ||
110 | extern int omap_board_config_size; | ||
111 | |||
112 | |||
113 | /* for TI reference platforms sharing the same debug card */ | 29 | /* for TI reference platforms sharing the same debug card */ |
114 | extern int debug_card_init(u32 addr, unsigned gpio); | 30 | extern int debug_card_init(u32 addr, unsigned gpio); |
115 | 31 | ||