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: 1163771 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 38F7B3FE80 for ; Fri, 6 Jul 2012 09:14:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752015Ab2GFJOQ (ORCPT ); Fri, 6 Jul 2012 05:14:16 -0400 Received: from na3sys009aog118.obsmtp.com ([74.125.149.244]:52443 "EHLO na3sys009aog118.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751184Ab2GFJOP (ORCPT ); Fri, 6 Jul 2012 05:14:15 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]) (using TLSv1) by na3sys009aob118.postini.com ([74.125.148.12]) with SMTP ID DSNKT/asZmwDMYpNmz7lWT5VgaKX5Hr8jOj6@postini.com; Fri, 06 Jul 2012 02:14:15 PDT Received: by obbuo13 with SMTP id uo13so17445811obb.5 for ; Fri, 06 Jul 2012 02:14:07 -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=ZPBWrx1PmQnnb0Lt3bQR5XJ7nvcgn6jvrbGAXEJJ6Wk53v3sm+PN9VzWJ26081VXo9 8saoKsVGJfv1oN2wcak2b0OqasGD/4Pe9zAsYwIhT/6uKTidJaHTLYMCGW4vIy7xlDaD cUGod/T2ttCIyyKuE43YoXYeGqH1zROJfWOu5dzkGCnsjAQyaQWVgodvKaBKEwPRn+Hy /uv1w65QMo9qiFl3YEahX5qeCNNPiN6GEamdUS68idrYPgH1l1x/A5x4ONtoDtTPsKJA JWzSWCD+HOqHEzxkFVlAo7SB70SDmLuRwf6wZTwkiBl8Mwih1/pxatsH4xu0pYFewDlS alWA== 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 Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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: ALoCoQkrPQp+7lp9PosiTwyc7m4i1pYomRHvA/dziV4QzOmBY1Gpb2G62/RsOj59pc2VRpK7akn7 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-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 }, };