diff options
| author | Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> | 2011-01-28 02:10:37 -0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:23:59 -0700 |
| commit | d31827bda5c60013b20b68eb05f42e6b6ed523a5 (patch) | |
| tree | 18d4f120608005c60b5f69a340176d6196132f17 /arch | |
| parent | 71a853bb5ab26da0cd24e41740a8489a8b65c92f (diff) | |
UBUNTU: SAUCE: omap3: beaglexm: fix DVI initialization
Function beagle_twl_gpio_setup is called after beagle_display_init, what
makes lets reset_gpio with an invalid value at the time it request the
gpio. As a side effect the DVI reset GPIO is not properly set.
Also removing old code that power down DVI in a hardcoded way, as it's
not necessary anymore.
Tested with Beagle-xM and C4.
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index d73ec628f83..8b9e8b01928 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -240,6 +240,12 @@ static void __init beagle_display_init(void) { int r; + /* DVI reset GPIO is different between beagle revisions */ + if (omap3_beagle_version == OMAP3BEAGLE_BOARD_XM) + beagle_dvi_device.reset_gpio = 129; + else + beagle_dvi_device.reset_gpio = 170; + r = gpio_request_one(beagle_dvi_device.reset_gpio, GPIOF_OUT_INIT_LOW, "DVI reset"); if (r < 0) @@ -535,10 +541,6 @@ static void __init omap3_beagle_init(void) omap_display_init(&beagle_dss_data); omap_serial_init(); - omap_mux_init_gpio(170, OMAP_PIN_INPUT); - /* REVISIT leave DVI powered down until it's needed ... */ - gpio_request_one(170, GPIOF_OUT_INIT_HIGH, "DVI_nPD"); - usb_musb_init(NULL); usbhs_init(&usbhs_bdata); omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions, |