From patchwork Thu Apr 29 12:08:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 51320 X-Patchwork-Delegate: amit.kucheria@canonical.com 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 6C13DB7D47 for ; Fri, 30 Apr 2010 19:10:34 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O7mEr-00021M-QO; Fri, 30 Apr 2010 10:10:25 +0100 Received: from compulab.co.il ([67.18.134.219]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O7SZ6-0004x2-HU for kernel-team@lists.ubuntu.com; Thu, 29 Apr 2010 13:10:00 +0100 Received: from [62.90.235.247] (helo=zimbra-mta.compulab.co.il) by compulab.site5.com with esmtp (Exim 4.69) (envelope-from ) id 1O7SZ5-0004km-Jb; Thu, 29 Apr 2010 07:10:00 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id 5D8EF9A002A; Thu, 29 Apr 2010 15:09:58 +0300 (IDT) X-Virus-Scanned: amavisd-new at compulab.co.il Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qaiYX0FOoBba; Thu, 29 Apr 2010 15:09:58 +0300 (IDT) Received: from droid.compulab.local (droid.compulab.local [10.1.1.77]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id 30B7C9A0026; Thu, 29 Apr 2010 15:09:58 +0300 (IDT) Received: from droid.compulab.local (localhost [127.0.0.1]) by droid.compulab.local (8.14.0/8.14.0) with ESMTP id o3TC8iQQ023843; Thu, 29 Apr 2010 15:08:44 +0300 Received: (from mike@localhost) by droid.compulab.local (8.14.4/8.14.0/Submit) id o3TC8iGO023842; Thu, 29 Apr 2010 15:08:44 +0300 X-Authentication-Warning: droid.compulab.local: mike set sender to mike@compulab.co.il using -f From: Mike Rapoport To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/4] OMAP3: beagle: make beagleboard boot with CONFIG_OMAP_MUX Date: Thu, 29 Apr 2010 15:08:29 +0300 Message-Id: X-Mailer: git-send-email 1.6.6.2 In-Reply-To: References: X-ACL-Warn: { X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - compulab.site5.com X-AntiAbuse: Original Domain - lists.ubuntu.com X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Source: X-Source-Args: X-Source-Dir: X-Mailman-Approved-At: Fri, 30 Apr 2010 10:10:23 +0100 Cc: Mike Rapoport X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 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 Enabling CONFIG_OMAP_MUX prevents boot on BeaglBoard. Provide temporaty fix until the problem is properly resolved. Signed-off-by: Mike Rapoport --- arch/arm/mach-omap2/board-omap3beagle.c | 8 ++++++++ arch/arm/mach-omap2/mux.c | 3 +++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 8e936e1..dd3ed80 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -46,6 +46,14 @@ #include #include +/* + FIXME: ugly fix to enable beagleboard boot with CONFIG_OMAP_MUX enabled. + undefining it here makes calls to omap_mux_* noops +*/ +#ifdef CONFIG_OMAP_MUX +#undef CONFIG_OMAP_MUX +#endif + #include "mux.h" #include "mmc-twl4030.h" diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 5fef73f..5e7978f 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -69,6 +69,9 @@ void omap_mux_write(u16 val, u16 reg) void omap_mux_write_array(struct omap_board_mux *board_mux) { + if (!board_mux) + return; + while (board_mux->reg_offset != OMAP_MUX_TERMINATOR) { omap_mux_write(board_mux->value, board_mux->reg_offset); board_mux++;