@@ -223,12 +223,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)
@@ -577,6 +571,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,
This reverts commit d01aeaf89ca0cbeef7919c1189bdcbea71026ec5. BugLink: http://bugs.launchpad.net/bugs/912199 Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- arch/arm/mach-omap2/board-omap3beagle.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)