From patchwork Tue Nov 6 13:16:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12689 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E8D0023DE1 for ; Tue, 6 Nov 2012 13:16:13 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9C246A19BEA for ; Tue, 6 Nov 2012 13:16:13 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so490729iej.11 for ; Tue, 06 Nov 2012 05:16:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=wz+eYFiXNHXH7SqDpGi6ZUi9/v6hYEZwj8ndHzz0c34=; b=iosSZrh5MXKWpzZswQu+hLMpa+U6kZO5vkUrobtIwctHQEIewZQqc5D6qX5jx9ThkS 2UuxNwK1sT31yM1TNkatvPMksG4IF3xtVxobn58Ck/df6TF7b+Nv1E6SOpaXNjw6l5pf nfMXUPh4VV/wc03H5BiBP57AGytifX2cBCIbS177dOx+0Uu34uJX0sfYci94UGmHbjTu CaLbOnz4kpN2Zc3RxL0C6zWv0LvOscbZR3JAhKy6xvdQ2TOEljvOMm4lSgSrJulQ6DjT qv52B3eBbWI4GRUhNjabKvd3j6/QHzHNwvdj1qJGQeVorJt9LnWXhUSZrk4XKpxsliOi TeOA== Received: by 10.50.40.166 with SMTP id y6mr843880igk.57.1352207773432; Tue, 06 Nov 2012 05:16:13 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp39803igt; Tue, 6 Nov 2012 05:16:12 -0800 (PST) Received: by 10.14.223.199 with SMTP id v47mr3314271eep.45.1352207772465; Tue, 06 Nov 2012 05:16:12 -0800 (PST) Received: from eu1sys200aog112.obsmtp.com (eu1sys200aog112.obsmtp.com [207.126.144.133]) by mx.google.com with SMTP id z46si14065979eeo.16.2012.11.06.05.16.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Nov 2012 05:16:12 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.133 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.133; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.133 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob112.postini.com ([207.126.147.11]) with SMTP ID DSNKUJkNmhYuzqyWGXvT/o9juUJykX7NLqqt@postini.com; Tue, 06 Nov 2012 13:16:12 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 662AB1E3; Tue, 6 Nov 2012 13:16:09 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 2FBAF48D8; Tue, 6 Nov 2012 13:16:09 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id BA0C6A8083; Tue, 6 Nov 2012 14:16:03 +0100 (CET) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 6 Nov 2012 14:16:08 +0100 From: Linus Walleij To: Cc: Anmar Oueja , Jorgen Jonsson , Linus Walleij Subject: [PATCH 9/9] ARM: ux500: fixup magnetometer pins Date: Tue, 6 Nov 2012 14:16:06 +0100 Message-ID: <1352207766-8103-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmcaaBBQv1FEAQwZhe33d4SJHw7K1Ozk16kL7YgJWqFhZkTVpkwpembkYjdhJyJfBu60ze7 From: Jorgen Jonsson GPIO31 and GPIO32 (CTS/RTS) are handled by the magnetometer and shall not simultaneously be controlled by UART2. Reported-by: Peter Nessrup Signed-off-by: Jorgen Jonsson Reviewed-by: Patrice Chotard Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/board-mop500-pins.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index f9ef2f4..5770ed0 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -148,15 +148,10 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = { * The setting on GPIO31 conflicts with magnetometer use on hrefv60 */ /* default state for UART2 */ - DB8500_MUX("u2ctsrts_c_1", "u2", "uart2"), - DB8500_PIN("GPIO31_V3", in_pu, "uart2"), /* CTS */ - DB8500_PIN("GPIO32_V2", out_hi, "uart2"), /* RTS */ DB8500_MUX("u2rxtx_c_1", "u2", "uart2"), DB8500_PIN("GPIO29_W2", in_pu, "uart2"), /* RXD */ DB8500_PIN("GPIO30_W3", out_hi, "uart2"), /* TXD */ /* Sleep state for UART2 */ - DB8500_PIN_SLEEP("GPIO31_V3", in_wkup_pdis, "uart2"), - DB8500_PIN_SLEEP("GPIO32_V2", out_hi_wkup_pdis, "uart2"), DB8500_PIN_SLEEP("GPIO29_W2", in_wkup_pdis, "uart2"), DB8500_PIN_SLEEP("GPIO30_W3", out_wkup_pdis, "uart2"), /*