diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-palmte.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 81fa27f88369..0863d8e2bdf1 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <linux/spi/spi.h> | 27 | #include <linux/spi/spi.h> |
28 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
29 | #include <linux/apm-emulation.h> | 29 | #include <linux/apm-emulation.h> |
30 | #include <linux/omapfb.h> | ||
30 | 31 | ||
31 | #include <mach/hardware.h> | ||
32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
@@ -41,6 +41,9 @@ | |||
41 | #include <plat/board.h> | 41 | #include <plat/board.h> |
42 | #include <plat/irda.h> | 42 | #include <plat/irda.h> |
43 | #include <plat/keypad.h> | 43 | #include <plat/keypad.h> |
44 | |||
45 | #include <mach/hardware.h> | ||
46 | |||
44 | #include "common.h" | 47 | #include "common.h" |
45 | 48 | ||
46 | #define PALMTE_USBDETECT_GPIO 0 | 49 | #define PALMTE_USBDETECT_GPIO 0 |
@@ -209,10 +212,6 @@ static struct omap_lcd_config palmte_lcd_config __initdata = { | |||
209 | .ctrl_name = "internal", | 212 | .ctrl_name = "internal", |
210 | }; | 213 | }; |
211 | 214 | ||
212 | static struct omap_board_config_kernel palmte_config[] __initdata = { | ||
213 | { OMAP_TAG_LCD, &palmte_lcd_config }, | ||
214 | }; | ||
215 | |||
216 | static struct spi_board_info palmte_spi_info[] __initdata = { | 215 | static struct spi_board_info palmte_spi_info[] __initdata = { |
217 | { | 216 | { |
218 | .modalias = "tsc2102", | 217 | .modalias = "tsc2102", |
@@ -250,9 +249,6 @@ static void __init omap_palmte_init(void) | |||
250 | omap_cfg_reg(UART3_TX); | 249 | omap_cfg_reg(UART3_TX); |
251 | omap_cfg_reg(UART3_RX); | 250 | omap_cfg_reg(UART3_RX); |
252 | 251 | ||
253 | omap_board_config = palmte_config; | ||
254 | omap_board_config_size = ARRAY_SIZE(palmte_config); | ||
255 | |||
256 | platform_add_devices(palmte_devices, ARRAY_SIZE(palmte_devices)); | 252 | platform_add_devices(palmte_devices, ARRAY_SIZE(palmte_devices)); |
257 | 253 | ||
258 | spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info)); | 254 | spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info)); |
@@ -260,6 +256,8 @@ static void __init omap_palmte_init(void) | |||
260 | omap_serial_init(); | 256 | omap_serial_init(); |
261 | omap1_usb_init(&palmte_usb_config); | 257 | omap1_usb_init(&palmte_usb_config); |
262 | omap_register_i2c_bus(1, 100, NULL, 0); | 258 | omap_register_i2c_bus(1, 100, NULL, 0); |
259 | |||
260 | omapfb_set_lcd_config(&palmte_lcd_config); | ||
263 | } | 261 | } |
264 | 262 | ||
265 | MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E") | 263 | MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E") |