diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-08-21 23:19:44 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-08-21 23:21:15 -0600 |
| commit | a99f4052c97b07c301562f42083f216dc5c71d6b (patch) | |
| tree | 409dd223282e16778e474c78ba5fb2441bcec068 | |
| parent | 72d1540fa33e348f965401544eafdaf9f6529d78 (diff) | |
Revert "UBUNTU: SAUCE: omap3: beaglexm: fix DVI initialization"
This reverts commit f6fa624e4c7cfc06c51451fe95ca0aa1c424639c.
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index f1eff0833f9..d63dd832bd3 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -251,12 +251,6 @@ static void __init beagle_display_init(void) { int r; - /* DVI reset GPIO is different between beagle revisions */ - if (omap3_beagle_get_rev() == 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) @@ -602,6 +596,10 @@ 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, |