From patchwork Wed May 8 09:09:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 2537971 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 742843FE1F for ; Wed, 8 May 2013 09:10:44 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ua0OW-0002lN-Ej; Wed, 08 May 2013 09:10:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ua0OT-0004PC-GB; Wed, 08 May 2013 09:10:37 +0000 Received: from mail-we0-x22d.google.com ([2a00:1450:400c:c03::22d]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ua0ON-0004Ok-9B for linux-arm-kernel@lists.infradead.org; Wed, 08 May 2013 09:10:35 +0000 Received: by mail-we0-f173.google.com with SMTP id q54so1498077wes.4 for ; Wed, 08 May 2013 02:10:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=83Dv4IUQuftQG7wCyyMv8z5LNQ97GAfx3QHbhQZMIMg=; b=e14gEwTELg9OjYufxCQ8dvnQtxDLr4zuIGOL3g6uFCA3zMQ8rnBjh2Lzts8LvuhF99 eCRMqPZ/F5MiiNxDuVvsQ7Gq5ekxV5holRNhsYVBiwGnc91ZJG5jLdWXwr2aWv9sJhv/ 5cJ48IfPQn53yy0n06BgwnEGRFF7Y6L7e3wNS9Uegqo4Ypo4F3Lqvvlr8fBjjvsBhDs8 RI5aIEvmLQZOYdkKEZji900Wu3XIgl90HltiEtoXgmlOZmWq/gDZ9Uk7S/N5QspAZL3Y ZNNLfFDD56WA3s/xCT0Df0HFYsDIhsC+1ma8ZJhe8aYSNRIARTEKOaskz+dtpCx7Fbcq uBLA== X-Received: by 10.180.212.46 with SMTP id nh14mr20071102wic.26.1368004206168; Wed, 08 May 2013 02:10:06 -0700 (PDT) Received: from localhost ([2a01:2003:1:1025:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPSA id e8sm7858146wic.5.2013.05.08.02.09.59 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 08 May 2013 02:10:05 -0700 (PDT) From: Fabio Baltieri To: Linus Walleij , Srinidhi Kasagar Subject: [PATCH] ARM: ux500: update MSP1 pinctrl defintions Date: Wed, 8 May 2013 11:09:53 +0200 Message-Id: <1368004193-21213-1-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.8.2 X-Gm-Message-State: ALoCoQlTq6NDp5ue/gpCGkf+9q9QB1QCOfFnj6mRmyw/yc3ck3e9jdAl6K7LNgtxnXsj4OVZKS1e X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130508_051031_436364_A1E98251 X-CRM114-Status: UNSURE ( 9.14 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Ola Lilja , Fabio Baltieri , linux-kernel@vger.kernel.org, Mark Brown , Lee Jones , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Update MSP1 pinctrl definitions in mop500_family_pinmap by removing sleep state and setting default ones as pin hogs, as those are used by both ux500-msp-i2s.1 and ux500-msp-i2s.3. Signed-off-by: Fabio Baltieri --- arch/arm/mach-ux500/board-mop500-pins.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 947bd9e..3f92308 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -174,17 +174,12 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = { DB8500_PIN_SLEEP("GPIO4_AH6", slpm_in_wkup_pdis, "uart1"), DB8500_PIN_SLEEP("GPIO5_AG6", slpm_out_wkup_pdis, "uart1"), /* MSP1 for ALSA codec */ - DB8500_MUX("msp1txrx_a_1", "msp1", "ux500-msp-i2s.1"), - DB8500_MUX("msp1_a_1", "msp1", "ux500-msp-i2s.1"), - DB8500_PIN("GPIO33_AF2", out_lo_slpm_nowkup, "ux500-msp-i2s.1"), - DB8500_PIN("GPIO34_AE1", in_nopull_slpm_nowkup, "ux500-msp-i2s.1"), - DB8500_PIN("GPIO35_AE2", in_nopull_slpm_nowkup, "ux500-msp-i2s.1"), - DB8500_PIN("GPIO36_AG2", in_nopull_slpm_nowkup, "ux500-msp-i2s.1"), - /* MSP1 sleep state */ - DB8500_PIN_SLEEP("GPIO33_AF2", slpm_out_lo_wkup, "ux500-msp-i2s.1"), - DB8500_PIN_SLEEP("GPIO34_AE1", slpm_in_nopull_wkup, "ux500-msp-i2s.1"), - DB8500_PIN_SLEEP("GPIO35_AE2", slpm_in_nopull_wkup, "ux500-msp-i2s.1"), - DB8500_PIN_SLEEP("GPIO36_AG2", slpm_in_nopull_wkup, "ux500-msp-i2s.1"), + DB8500_MUX_HOG("msp1txrx_a_1", "msp1"), + DB8500_MUX_HOG("msp1_a_1", "msp1"), + DB8500_PIN_HOG("GPIO33_AF2", out_lo_slpm_nowkup), + DB8500_PIN_HOG("GPIO34_AE1", in_nopull_slpm_nowkup), + DB8500_PIN_HOG("GPIO35_AE2", in_nopull_slpm_nowkup), + DB8500_PIN_HOG("GPIO36_AG2", in_nopull_slpm_nowkup), /* Mux in LCD data lines 8 thru 11 and LCDA CLK for MCDE TVOUT */ DB8500_MUX("lcd_d8_d11_a_1", "lcd", "mcde-tvout"), DB8500_MUX("lcdaclk_b_1", "lcda", "mcde-tvout"),