From patchwork Mon Jul 22 05:29:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 2831028 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 91C0B9F243 for ; Mon, 22 Jul 2013 05:30:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B38D720136 for ; Mon, 22 Jul 2013 05:30:29 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75AEE2011C for ; Mon, 22 Jul 2013 05:30:28 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V18hD-0004KG-0l; Mon, 22 Jul 2013 05:30:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V18hA-0006Ac-OF; Mon, 22 Jul 2013 05:30:04 +0000 Received: from utopia.booyaka.com ([74.50.51.50]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V18h6-0006AB-El for linux-arm-kernel@lists.infradead.org; Mon, 22 Jul 2013 05:30:01 +0000 Received: (qmail 9614 invoked by uid 1019); 22 Jul 2013 05:29:35 -0000 Date: Mon, 22 Jul 2013 05:29:35 +0000 (UTC) From: Paul Walmsley To: stable@vger.kernel.org Subject: [PATCH] ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130722_013000_633613_D6F4E0FF X-CRM114-Status: GOOD ( 14.64 ) X-Spam-Score: -1.9 (-) Cc: tony@atomide.com, lokeshvutla@ti.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, rnayak@ti.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Lokesh Vutla On 37xx EVM non-dt boot fails with current mainline, because of broken GPIO numbering in the board file that uses hardcoded GPIOs. So marking omap3_evm_display_init() with CONFIG_BROKEN for now as suggested by Tony as per the below link: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg90399.html Signed-off-by: Lokesh Vutla Tested-by: Paul Walmsley Signed-off-by: Tony Lindgren --- Hi -stablers, OMAP37xx EVM does not boot on v3.10 without this patch, so please consider it for the v3.10 stable releases. It is upstream already as commit ID 8fb61e8d84e673eebf31e564a83bb71a50b1ed48. Perhaps if I had managed to test it sooner, we could have gotten it up during v3.10-rc, but, alas, stable it is... arch/arm/mach-omap2/board-omap3evm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index f76d0de..278bf25 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -174,6 +174,7 @@ static struct panel_sharp_ls037v7dw01_data omap3_evm_lcd_data = { .ud_gpio = OMAP3EVM_LCD_PANEL_UD, }; +#ifdef CONFIG_BROKEN static void __init omap3_evm_display_init(void) { int r; @@ -193,6 +194,7 @@ static void __init omap3_evm_display_init(void) else gpio_set_value_cansleep(OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO, 1); } +#endif static struct omap_dss_device omap3_evm_lcd_device = { .name = "lcd", @@ -715,7 +717,9 @@ static void __init omap3_evm_init(void) omap_ads7846_init(1, OMAP3_EVM_TS_GPIO, 310, NULL); omap3evm_init_smsc911x(); +#ifdef CONFIG_BROKEN omap3_evm_display_init(); +#endif omap3_evm_wl12xx_init(); omap_twl4030_audio_init("omap3evm", NULL); }