From patchwork Fri Jul 6 13:19:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1165851 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 9C94C3FE80 for ; Fri, 6 Jul 2012 13:19:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756214Ab2GFNTN (ORCPT ); Fri, 6 Jul 2012 09:19:13 -0400 Received: from na3sys009aog125.obsmtp.com ([74.125.149.153]:53770 "EHLO na3sys009aog125.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753653Ab2GFNTM (ORCPT ); Fri, 6 Jul 2012 09:19:12 -0400 Received: from mail-yx0-f170.google.com ([209.85.213.170]) (using TLSv1) by na3sys009aob125.postini.com ([74.125.148.12]) with SMTP ID DSNKT/blz6NfZkmlOptUQu0WqHRsHL0qDfcE@postini.com; Fri, 06 Jul 2012 06:19:12 PDT Received: by yenl12 with SMTP id l12so7778634yen.15 for ; Fri, 06 Jul 2012 06:19:11 -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:in-reply-to:references :x-gm-message-state; bh=3h7cPSmaVs71wvNOITWiaXEM0/e853Lf1FA+q77Ch04=; b=DxhSPdGP49IEXyFtP78BjzdYa5BZe58fsuiBVcKG3JMwvPuMNKz+ltIov1OZ3/rsMs TJwcPZiymejzChqYBPlfUtnB+qnNLwre9fH1zyuh/fEDusmpBEqt5cjC49d7z9r5oMUf Gy6l06IqjDnalJNokh+Y3jH5UUWLvsE6AsQyOhGFPtyvIegteevoneXcPneCq75k5HcI +INSe8Mo4CL4ajb4oGf8GBBGSf6XDwKTuBNNdlwXKjWRZuTAJQFiHE55b28Yc74Rx/5k MZ3YBxOoGqkRibnrmvT4YvuRTg9FHWlnlXbhDXXdWD0llKobKkiM8gv9fqe7c2Ylph2t X8TA== Received: by 10.60.1.40 with SMTP id 8mr30924504oej.70.1341580751194; Fri, 06 Jul 2012 06:19:11 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id th10sm23279750obb.15.2012.07.06.06.19.08 (version=SSLv3 cipher=OTHER); Fri, 06 Jul 2012 06:19:10 -0700 (PDT) From: Peter Ujfalusi To: Tony Lindgren Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Santosh Shilimkar Subject: [PATCH v2 2/2] ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2 Date: Fri, 6 Jul 2012 15:19:12 +0200 Message-Id: <1341580752-5501-3-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1341580752-5501-1-git-send-email-peter.ujfalusi@ti.com> References: <1341580752-5501-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQnEu8Hrc9YigE/87+TQQTamKL4F44YWPRdCqQW3rC8Ft4l6RJ67T6jwzVCmAUI4tjFTUFND Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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-omap4panda.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 982fb26..b627cdc 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -379,6 +379,9 @@ static struct omap_board_mux board_mux[] __initdata = { OMAP4_MUX(DPM_EMU18, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5), /* dispc2_data0 */ OMAP4_MUX(DPM_EMU19, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5), + /* NIRQ2 for twl6040 */ + OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE0 | + OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE), { .reg_offset = OMAP_MUX_TERMINATOR }, };