diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-17 06:30:27 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-09 03:51:04 -0400 |
commit | e813a55eb9c9bc6c8039fb16332cf43402125b30 (patch) | |
tree | 18b4450d21ba7755587d442865142f641fee3f14 /arch/arm/mach-omap2/board-omap4panda.c | |
parent | 2da35193dc81b574001a47347f41c4922b1266d3 (diff) |
OMAP: board-files: remove custom PD GPIO handling for DVI output
Now that the panel-dvi driver handles the PD (power-down) GPIO, we can
remove the custom PD handling from the board files.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 1b782ba53433..ddf8253a7a0a 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -420,22 +420,10 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
420 | /* Display DVI */ | 420 | /* Display DVI */ |
421 | #define PANDA_DVI_TFP410_POWER_DOWN_GPIO 0 | 421 | #define PANDA_DVI_TFP410_POWER_DOWN_GPIO 0 |
422 | 422 | ||
423 | static int omap4_panda_enable_dvi(struct omap_dss_device *dssdev) | ||
424 | { | ||
425 | gpio_set_value(dssdev->reset_gpio, 1); | ||
426 | return 0; | ||
427 | } | ||
428 | |||
429 | static void omap4_panda_disable_dvi(struct omap_dss_device *dssdev) | ||
430 | { | ||
431 | gpio_set_value(dssdev->reset_gpio, 0); | ||
432 | } | ||
433 | |||
434 | /* Using generic display panel */ | 423 | /* Using generic display panel */ |
435 | static struct panel_dvi_platform_data omap4_dvi_panel = { | 424 | static struct panel_dvi_platform_data omap4_dvi_panel = { |
436 | .platform_enable = omap4_panda_enable_dvi, | 425 | .i2c_bus_num = 3, |
437 | .platform_disable = omap4_panda_disable_dvi, | 426 | .power_down_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO, |
438 | .i2c_bus_num = 3, | ||
439 | }; | 427 | }; |
440 | 428 | ||
441 | struct omap_dss_device omap4_panda_dvi_device = { | 429 | struct omap_dss_device omap4_panda_dvi_device = { |
@@ -448,18 +436,6 @@ struct omap_dss_device omap4_panda_dvi_device = { | |||
448 | .channel = OMAP_DSS_CHANNEL_LCD2, | 436 | .channel = OMAP_DSS_CHANNEL_LCD2, |
449 | }; | 437 | }; |
450 | 438 | ||
451 | int __init omap4_panda_dvi_init(void) | ||
452 | { | ||
453 | int r; | ||
454 | |||
455 | /* Requesting TFP410 DVI GPIO and disabling it, at bootup */ | ||
456 | r = gpio_request_one(omap4_panda_dvi_device.reset_gpio, | ||
457 | GPIOF_OUT_INIT_LOW, "DVI PD"); | ||
458 | if (r) | ||
459 | pr_err("Failed to get DVI powerdown GPIO\n"); | ||
460 | |||
461 | return r; | ||
462 | } | ||
463 | 439 | ||
464 | static struct gpio panda_hdmi_gpios[] = { | 440 | static struct gpio panda_hdmi_gpios[] = { |
465 | { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" }, | 441 | { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" }, |
@@ -511,11 +487,6 @@ static struct omap_dss_board_info omap4_panda_dss_data = { | |||
511 | 487 | ||
512 | void __init omap4_panda_display_init(void) | 488 | void __init omap4_panda_display_init(void) |
513 | { | 489 | { |
514 | int r; | ||
515 | |||
516 | r = omap4_panda_dvi_init(); | ||
517 | if (r) | ||
518 | pr_err("error initializing panda DVI\n"); | ||
519 | 490 | ||
520 | omap_display_init(&omap4_panda_dss_data); | 491 | omap_display_init(&omap4_panda_dss_data); |
521 | 492 | ||