diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-04-19 12:36:33 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-30 09:21:04 -0400 |
commit | 1382f897e6136f504b227e27bec64842ed7bc150 (patch) | |
tree | d3a48ac6ae8783f09d98cb954a3b5d3f2878d627 /arch/arm/mach-omap2/board-omap3touchbook.c | |
parent | cc93473525099f6e4c291d0f2383545cc92e50d0 (diff) |
OMAP: omap3touchbook: Remove unused lcd stuff
board-omap3touchbook.c adds an LCD device, but the kernel doesn't
contain a driver for the device. So let's remove the unneeded LCD
device.
Cc: Gregoire Gentil <gregoire@gentil.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 852ea046405..80e82763ebd 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
@@ -104,15 +104,6 @@ static struct omap2_hsmmc_info mmc[] = { | |||
104 | {} /* Terminator */ | 104 | {} /* Terminator */ |
105 | }; | 105 | }; |
106 | 106 | ||
107 | static struct platform_device omap3_touchbook_lcd_device = { | ||
108 | .name = "omap3touchbook_lcd", | ||
109 | .id = -1, | ||
110 | }; | ||
111 | |||
112 | static struct omap_lcd_config omap3_touchbook_lcd_config __initdata = { | ||
113 | .ctrl_name = "internal", | ||
114 | }; | ||
115 | |||
116 | static struct regulator_consumer_supply touchbook_vmmc1_supply[] = { | 107 | static struct regulator_consumer_supply touchbook_vmmc1_supply[] = { |
117 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), | 108 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), |
118 | }; | 109 | }; |
@@ -165,14 +156,12 @@ static struct twl4030_gpio_platform_data touchbook_gpio_data = { | |||
165 | static struct regulator_consumer_supply touchbook_vdac_supply[] = { | 156 | static struct regulator_consumer_supply touchbook_vdac_supply[] = { |
166 | { | 157 | { |
167 | .supply = "vdac", | 158 | .supply = "vdac", |
168 | .dev = &omap3_touchbook_lcd_device.dev, | ||
169 | }, | 159 | }, |
170 | }; | 160 | }; |
171 | 161 | ||
172 | static struct regulator_consumer_supply touchbook_vdvi_supply[] = { | 162 | static struct regulator_consumer_supply touchbook_vdvi_supply[] = { |
173 | { | 163 | { |
174 | .supply = "vdvi", | 164 | .supply = "vdvi", |
175 | .dev = &omap3_touchbook_lcd_device.dev, | ||
176 | }, | 165 | }, |
177 | }; | 166 | }; |
178 | 167 | ||
@@ -316,10 +305,6 @@ static struct platform_device keys_gpio = { | |||
316 | }, | 305 | }, |
317 | }; | 306 | }; |
318 | 307 | ||
319 | static struct omap_board_config_kernel omap3_touchbook_config[] __initdata = { | ||
320 | { OMAP_TAG_LCD, &omap3_touchbook_lcd_config }, | ||
321 | }; | ||
322 | |||
323 | #ifdef CONFIG_OMAP_MUX | 308 | #ifdef CONFIG_OMAP_MUX |
324 | static struct omap_board_mux board_mux[] __initdata = { | 309 | static struct omap_board_mux board_mux[] __initdata = { |
325 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 310 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
@@ -339,7 +324,6 @@ static void __init omap3_touchbook_init_irq(void) | |||
339 | } | 324 | } |
340 | 325 | ||
341 | static struct platform_device *omap3_touchbook_devices[] __initdata = { | 326 | static struct platform_device *omap3_touchbook_devices[] __initdata = { |
342 | &omap3_touchbook_lcd_device, | ||
343 | &leds_gpio, | 327 | &leds_gpio, |
344 | &keys_gpio, | 328 | &keys_gpio, |
345 | }; | 329 | }; |
@@ -376,8 +360,6 @@ early_param("tbr", early_touchbook_revision); | |||
376 | static void __init omap3_touchbook_init(void) | 360 | static void __init omap3_touchbook_init(void) |
377 | { | 361 | { |
378 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | 362 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); |
379 | omap_board_config = omap3_touchbook_config; | ||
380 | omap_board_config_size = ARRAY_SIZE(omap3_touchbook_config); | ||
381 | 363 | ||
382 | pm_power_off = omap3_touchbook_poweroff; | 364 | pm_power_off = omap3_touchbook_poweroff; |
383 | 365 | ||