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: 16780 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-bk0-f72.google.com (mail-bk0-f72.google.com [209.85.214.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4DCC7238FB for ; Wed, 8 May 2013 09:10:31 +0000 (UTC) Received: by mail-bk0-f72.google.com with SMTP id jc3sf1429213bkc.3 for ; Wed, 08 May 2013 02:10:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=83Dv4IUQuftQG7wCyyMv8z5LNQ97GAfx3QHbhQZMIMg=; b=VycWxmtQbmYuChRj0eg9bv91/R40J/PMOfZpCSAUmMj0T5yhlm2DYj0bqR2dmRBobd h4T9ox+gLHAvSFWFW5G5U7CVgwKVNdOEJJRPKdwa/RF931lMMQxqnt2ofHQ0+/swRnTj brvS8M7wQQ4bRm+b1dUWee5HLeJQohPYYQuuxhI9xNuRuerGacJFZRramc7tTbSysura 29w4ocd84wZsjwiLMVW6aFpSysO4+CbSlPL+A/NEiuibKq8VRIEY2Oq0BCAPnp4efMkU WbHEFppeDA1xweU3nwuQKZ5RSKDQXdS48xF07aTjiYNrj1HBW3+fSDP05cqHE+LsCghg osxQ== X-Received: by 10.180.182.6 with SMTP id ea6mr19367872wic.4.1368004209479; Wed, 08 May 2013 02:10:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.101.168 with SMTP id fh8ls509752wib.21.gmail; Wed, 08 May 2013 02:10:09 -0700 (PDT) X-Received: by 10.194.93.68 with SMTP id cs4mr9092980wjb.17.1368004209388; Wed, 08 May 2013 02:10:09 -0700 (PDT) Received: from mail-ve0-x235.google.com (mail-ve0-x235.google.com [2607:f8b0:400c:c01::235]) by mx.google.com with ESMTPS id 1si9158132wjp.72.2013.05.08.02.10.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 02:10:09 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::235; Received: by mail-ve0-f181.google.com with SMTP id d10so1525162vea.40 for ; Wed, 08 May 2013 02:10:08 -0700 (PDT) X-Received: by 10.52.53.36 with SMTP id y4mr3020280vdo.51.1368004208306; Wed, 08 May 2013 02:10:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp145086veb; Wed, 8 May 2013 02:10:07 -0700 (PDT) X-Received: by 10.180.185.179 with SMTP id fd19mr8728888wic.1.1368004206674; Wed, 08 May 2013 02:10:06 -0700 (PDT) Received: from mail-wi0-x22e.google.com (mail-wi0-x22e.google.com [2a00:1450:400c:c05::22e]) by mx.google.com with ESMTPS id d20si9137724wjs.230.2013.05.08.02.10.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 May 2013 02:10:06 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22e is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=2a00:1450:400c:c05::22e; Received: by mail-wi0-f174.google.com with SMTP id m6so4767882wiv.1 for ; Wed, 08 May 2013 02:10:06 -0700 (PDT) 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 Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Ola Lilja , Mark Brown , Fabio Baltieri 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: ALoCoQnkmACVzIZb+Zg1Rg1uM1iJP9/6aKqlOR3OnOudusvAwOv8Nk60aU73HAGReI9CdhPlIThu X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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"),