From patchwork Fri Jul 6 08:49:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1163761 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 C412E40135 for ; Fri, 6 Jul 2012 09:13:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751661Ab2GFJNN (ORCPT ); Fri, 6 Jul 2012 05:13:13 -0400 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]:59372 "EHLO na3sys009aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751141Ab2GFJNM (ORCPT ); Fri, 6 Jul 2012 05:13:12 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKT/asKDCmqiQ7tSNmp3UamCo1k43cz6l9@postini.com; Fri, 06 Jul 2012 02:13:12 PDT Received: by obbuo13 with SMTP id uo13so14793104obb.19 for ; Fri, 06 Jul 2012 02:13: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=eAFVCy2cvFUe6JpHzOTJPBtlfPYqanW0UvN8z32yNT0=; b=adj1OEn6JJ1FI2Lm7L4DFLotE5Mj7elNZjEvVm0Fi1rN7ARC/x6VZmbdd5I46pncdZ MdjhfE4M8qIc0hoKhjEGeWGxwLMbbJOfbiHWpSrWH6RzSZvyjiXhNNFjAGisZ9u9ZBXP IvEwh/ygat90KgCANqXB5oeBn4WzRtbovVYsQtZ9NvTlJ1pEQ21OuZFURvIirgb+tWkY AQo4ijm1XOECBzhNrs4rXVIPQ1jZdsYlCZjbz7s+6PXH4cKdHEUMAPRGYjIldsVb2jUf K35PDDyR4qYBYnOd81W6oqQ8E04/VfLyAwlCsPVSOC7CngEXCLbw1CioMXu5LNbzoWmY ojfA== Received: by 10.60.172.143 with SMTP id bc15mr30101161oec.73.1341564592015; Fri, 06 Jul 2012 01:49:52 -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.49 (version=SSLv3 cipher=OTHER); Fri, 06 Jul 2012 01:49:51 -0700 (PDT) From: Peter Ujfalusi To: Tony Lindgren Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2 Date: Fri, 6 Jul 2012 10:49:50 +0200 Message-Id: <1341564590-14024-2-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1341564590-14024-1-git-send-email-peter.ujfalusi@ti.com> References: <1341564590-14024-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQm1pVsm18AT7UuiaCjPcEN8DOfN2Vc7bLGHlGKH8sF0hj9cHt0LcsJE6uNYMRRF1sPXkcoP 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 --- 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..6111b72 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_MODE1 | + OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE), { .reg_offset = OMAP_MUX_TERMINATOR }, };