From patchwork Mon Jan 9 11:09:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 134991 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 98715B6F9D for ; Mon, 9 Jan 2012 22:09:50 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RkD6j-0001wp-Ru; Mon, 09 Jan 2012 11:09:41 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RkD6Z-0001ub-DE for kernel-team@lists.ubuntu.com; Mon, 09 Jan 2012 11:09:31 +0000 Received: from business-89-133-214-90.business.broadband.hu ([89.133.214.90] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RkD6Z-0003BT-9w for kernel-team@lists.ubuntu.com; Mon, 09 Jan 2012 11:09:31 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/5] Revert "UBUNTU: SAUCE: omap3: beaglexm: fix DVI initialization" Date: Mon, 9 Jan 2012 12:09:26 +0100 Message-Id: <1326107367-13682-5-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1326107367-13682-1-git-send-email-paolo.pisati@canonical.com> References: <1326107367-13682-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This reverts commit d01aeaf89ca0cbeef7919c1189bdcbea71026ec5. 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 24e59ec..04dad29 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -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,