diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-20 08:35:37 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-23 02:39:31 -0500 |
commit | 5f1cc13fbf4cd0f798a08af2e0c04ae80ceac5e3 (patch) | |
tree | c37a01284259f558f1994cce2128081f7b06de88 | |
parent | 1b2240eff66cb44f1d1c7c2c2497ff50ad3d1538 (diff) |
OMAP1: Remove unused LCD devices from board files
Some OMAP1 board files define LCD platform_devices, but there are no
corresponding LCD drivers for those in the kernel. Thus remove these LCD
devices.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap1/board-fsample.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-sx1.c | 6 |
4 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index b00844f7414d..7afaf3c5bdc6 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c | |||
@@ -274,17 +274,11 @@ static struct platform_device kp_device = { | |||
274 | .resource = kp_resources, | 274 | .resource = kp_resources, |
275 | }; | 275 | }; |
276 | 276 | ||
277 | static struct platform_device lcd_device = { | ||
278 | .name = "lcd_p2", | ||
279 | .id = -1, | ||
280 | }; | ||
281 | |||
282 | static struct platform_device *devices[] __initdata = { | 277 | static struct platform_device *devices[] __initdata = { |
283 | &nor_device, | 278 | &nor_device, |
284 | &nand_device, | 279 | &nand_device, |
285 | &smc91x_device, | 280 | &smc91x_device, |
286 | &kp_device, | 281 | &kp_device, |
287 | &lcd_device, | ||
288 | }; | 282 | }; |
289 | 283 | ||
290 | static struct omap_lcd_config fsample_lcd_config = { | 284 | static struct omap_lcd_config fsample_lcd_config = { |
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 471233fe147a..af2be8c12c07 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -326,18 +326,12 @@ static struct platform_device h2_irda_device = { | |||
326 | .resource = h2_irda_resources, | 326 | .resource = h2_irda_resources, |
327 | }; | 327 | }; |
328 | 328 | ||
329 | static struct platform_device h2_lcd_device = { | ||
330 | .name = "lcd_h2", | ||
331 | .id = -1, | ||
332 | }; | ||
333 | |||
334 | static struct platform_device *h2_devices[] __initdata = { | 329 | static struct platform_device *h2_devices[] __initdata = { |
335 | &h2_nor_device, | 330 | &h2_nor_device, |
336 | &h2_nand_device, | 331 | &h2_nand_device, |
337 | &h2_smc91x_device, | 332 | &h2_smc91x_device, |
338 | &h2_irda_device, | 333 | &h2_irda_device, |
339 | &h2_kp_device, | 334 | &h2_kp_device, |
340 | &h2_lcd_device, | ||
341 | }; | 335 | }; |
342 | 336 | ||
343 | static void __init h2_init_smc91x(void) | 337 | static void __init h2_init_smc91x(void) |
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 44df93172653..8e0153447c6d 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -233,17 +233,11 @@ static struct platform_device kp_device = { | |||
233 | .resource = kp_resources, | 233 | .resource = kp_resources, |
234 | }; | 234 | }; |
235 | 235 | ||
236 | static struct platform_device lcd_device = { | ||
237 | .name = "lcd_p2", | ||
238 | .id = -1, | ||
239 | }; | ||
240 | |||
241 | static struct platform_device *devices[] __initdata = { | 236 | static struct platform_device *devices[] __initdata = { |
242 | &nor_device, | 237 | &nor_device, |
243 | &nand_device, | 238 | &nand_device, |
244 | &smc91x_device, | 239 | &smc91x_device, |
245 | &kp_device, | 240 | &kp_device, |
246 | &lcd_device, | ||
247 | }; | 241 | }; |
248 | 242 | ||
249 | static struct omap_lcd_config perseus2_lcd_config __initdata = { | 243 | static struct omap_lcd_config perseus2_lcd_config __initdata = { |
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 0c880be11276..0c76e12337d9 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c | |||
@@ -356,11 +356,6 @@ static struct omap_usb_config sx1_usb_config __initdata = { | |||
356 | 356 | ||
357 | /*----------- LCD -------------------------*/ | 357 | /*----------- LCD -------------------------*/ |
358 | 358 | ||
359 | static struct platform_device sx1_lcd_device = { | ||
360 | .name = "lcd_sx1", | ||
361 | .id = -1, | ||
362 | }; | ||
363 | |||
364 | static struct omap_lcd_config sx1_lcd_config __initdata = { | 359 | static struct omap_lcd_config sx1_lcd_config __initdata = { |
365 | .ctrl_name = "internal", | 360 | .ctrl_name = "internal", |
366 | }; | 361 | }; |
@@ -369,7 +364,6 @@ static struct omap_lcd_config sx1_lcd_config __initdata = { | |||
369 | static struct platform_device *sx1_devices[] __initdata = { | 364 | static struct platform_device *sx1_devices[] __initdata = { |
370 | &sx1_flash_device, | 365 | &sx1_flash_device, |
371 | &sx1_kp_device, | 366 | &sx1_kp_device, |
372 | &sx1_lcd_device, | ||
373 | &sx1_irda_device, | 367 | &sx1_irda_device, |
374 | }; | 368 | }; |
375 | 369 | ||