From patchwork Fri Jul 6 08:49:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1163651 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 93707DF236 for ; Fri, 6 Jul 2012 08:56:03 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sn4G9-00036B-RC; Fri, 06 Jul 2012 08:51:29 +0000 Received: from na3sys009aog125.obsmtp.com ([74.125.149.153]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sn4FM-00034o-L0 for linux-arm-kernel@lists.infradead.org; Fri, 06 Jul 2012 08:50:47 +0000 Received: from mail-ob0-f182.google.com ([209.85.214.182]) (using TLSv1) by na3sys009aob125.postini.com ([74.125.148.12]) with SMTP ID DSNKT/amrjugnYHgazr2J8mQpZJXBk8HN9O3@postini.com; Fri, 06 Jul 2012 01:50:40 PDT Received: by obbun3 with SMTP id un3so25861017obb.27 for ; Fri, 06 Jul 2012 01:49:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=KMy8zkxVGs2U4onwjhMNZ0NsfvVcmM8G3IofOWJbYGI=; b=FuvK+WeMEO7mWwEN7aWdGGC2VBUQsd3Nbbv9/LR3qbE20Zm6YyKzk2lFfp6EsvA6z9 oTmgvWoWE9sWkFnb34yxr7pJv0pDaO3QSxThCTOx0+RtXOZInzOTaTE/uSEKmgWXtGPE /rhXibMdSG6B9GVpYAajceQETvjDXupiA8t7NJYCv0SavW0lEItVSrUVakGBEazYjH65 2QXp9nq3vJ8cUmrvSJViLBV9iZbfyyyeA0+5z/BW+Mm0MLLAELTxFJ5bRofHFXJ1Oftp 9QiXz0yE/62/CqKUroF1yiQO/Lom3qb5zeW2VDW+0bEjHT11rW5NoeaiXmL7ZtYs2ide 5JZg== Received: by 10.182.111.39 with SMTP id if7mr24743520obb.56.1341564589564; Fri, 06 Jul 2012 01:49:49 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id aa6sm9395734oec.0.2012.07.06.01.49.46 (version=SSLv3 cipher=OTHER); Fri, 06 Jul 2012 01:49:48 -0700 (PDT) From: Peter Ujfalusi To: Tony Lindgren Subject: [PATCH 1/2] ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2 Date: Fri, 6 Jul 2012 10:49:49 +0200 Message-Id: <1341564590-14024-1-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 X-Gm-Message-State: ALoCoQlhJTD+SUHh9mcttxlGywaErI2u4upu5sr7jrI5GEQUQUWEfGnRlrRBbeK17HUPvn56sKrO X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.153 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The sys_nirq2 is used for twl6040, make sure the pin is configured correctly. Signed-off-by: Peter Ujfalusi Acked-by: Santosh Shilimkar --- arch/arm/mach-omap2/board-4430sdp.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index c4e17641..050cc8e 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -827,6 +827,9 @@ static void __init omap_4430sdp_display_init(void) #ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), + /* NIRQ2 for twl6040 */ + OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE1 | + OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE), { .reg_offset = OMAP_MUX_TERMINATOR }, };