diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-11 02:51:21 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-11 02:51:21 -0400 |
commit | d211093fbad99e6c38e168f71ca2ede64a51fe58 (patch) | |
tree | cd08522ca6fefee1f3608f84b4f3419e5af332e1 /arch/arm/mach-omap2/board-omap4panda.c | |
parent | a9a9bb2062b9202dda0b2a84b44e305669136d1a (diff) | |
parent | 21f787b356279798a002c68d53628755c84168de (diff) |
Merge tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Clean up for omap DSS board init in preparation for adding DT support.
By Tomi Valkeinen
via Tomi Valkeinen (1) and Tony Lindgren (1)
* tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
OMAPDSS: DSI: implement generic DSI pin config
OMAPDSS: Taal: move reset gpio handling to taal driver
OMAPDSS: TFP410: rename dvi files to tfp410
OMAPDSS: TFP410: rename dvi -> tfp410
OMAP: board-files: remove custom PD GPIO handling for DVI output
OMAPDSS: panel-dvi: add PD gpio handling
Resolved context conflicts in arch/arm/mach-omap2/board-omap4panda.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 8216e5f64a6a..59dd8b7f5b4f 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include "common.h" | 42 | #include "common.h" |
43 | #include <plat/usb.h> | 43 | #include <plat/usb.h> |
44 | #include <plat/mmc.h> | 44 | #include <plat/mmc.h> |
45 | #include <video/omap-panel-dvi.h> | 45 | #include <video/omap-panel-tfp410.h> |
46 | 46 | ||
47 | #include "hsmmc.h" | 47 | #include "hsmmc.h" |
48 | #include "control.h" | 48 | #include "control.h" |
@@ -420,47 +420,22 @@ 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 tfp410_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 | static struct omap_dss_device omap4_panda_dvi_device = { | 429 | static struct omap_dss_device omap4_panda_dvi_device = { |
442 | .type = OMAP_DISPLAY_TYPE_DPI, | 430 | .type = OMAP_DISPLAY_TYPE_DPI, |
443 | .name = "dvi", | 431 | .name = "dvi", |
444 | .driver_name = "dvi", | 432 | .driver_name = "tfp410", |
445 | .data = &omap4_dvi_panel, | 433 | .data = &omap4_dvi_panel, |
446 | .phy.dpi.data_lines = 24, | 434 | .phy.dpi.data_lines = 24, |
447 | .reset_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO, | 435 | .reset_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO, |
448 | .channel = OMAP_DSS_CHANNEL_LCD2, | 436 | .channel = OMAP_DSS_CHANNEL_LCD2, |
449 | }; | 437 | }; |
450 | 438 | ||
451 | static 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 | |||
464 | static struct gpio panda_hdmi_gpios[] = { | 439 | static struct gpio panda_hdmi_gpios[] = { |
465 | { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" }, | 440 | { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" }, |
466 | { HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" }, | 441 | { HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" }, |
@@ -511,11 +486,6 @@ static struct omap_dss_board_info omap4_panda_dss_data = { | |||
511 | 486 | ||
512 | static void __init omap4_panda_display_init(void) | 487 | static void __init omap4_panda_display_init(void) |
513 | { | 488 | { |
514 | int r; | ||
515 | |||
516 | r = omap4_panda_dvi_init(); | ||
517 | if (r) | ||
518 | pr_err("error initializing panda DVI\n"); | ||
519 | 489 | ||
520 | omap_display_init(&omap4_panda_dss_data); | 490 | omap_display_init(&omap4_panda_dss_data); |
521 | 491 | ||