From patchwork Mon Jan 9 10:46:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/3] Revert "UBUNTU: SAUCE: omap3: beaglexm: fix DVI initialization" From: Paolo Pisati X-Patchwork-Id: 134986 Message-Id: <1326105976-13225-4-git-send-email-paolo.pisati@canonical.com> To: kernel-team@lists.ubuntu.com Date: Mon, 9 Jan 2012 11:46:16 +0100 This reverts commit 46153cc302115df2c9f5950f0a72022ac33b9b52. BugLink: http://bugs.launchpad.net/bugs/912199 Signed-off-by: Paolo Pisati --- 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 4d6b962..4a71cb7 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -240,12 +240,6 @@ 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) @@ -538,6 +532,10 @@ static void __init omap3_beagle_init(void) omap_sdrc_init(mt46h32m32lf6_sdrc_params, mt46h32m32lf6_sdrc_params); + 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,