From patchwork Tue Sep 18 10:09:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11494 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 4CA5723EFD for ; Tue, 18 Sep 2012 10:10:21 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 78DBB3D093DF for ; Tue, 18 Sep 2012 10:10:20 +0000 (UTC) Received: by iafj25 with SMTP id j25so5807239iaf.11 for ; Tue, 18 Sep 2012 03:10:19 -0700 (PDT) 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=yf9fs4lvVDxUv323S3QqB03J3nHkdvrdxdl7dGhEugQ=; b=Iw+UXf7PQRJLySID3suupGdUcMhlwVOS1CjucUdnnidin9QIJBd24Rth9cTW2Wqi0X kjGzFLL6Mis5lI4wD/ZEffHZuX6H2zeDfoE7xNqvY11Fdtl/45ZPonBXlM4r8e9bBZUO X9TZhluVWfBIABh9Lank80l6NJdOi3fNCaVjR0/h310sAA0j0rw7JXcRA9tygygewbNX fi+niGFDlpdfMQVVb/lDgpxDpWvlPaxXbGZa1wSUeTT1ITVZ/o9H8xP3EEua1buMOKr6 hLmhBU3dYcwyMhBEz7JfXwfO1SbXBJIR8mry9zPaSWGMuURLPnEPcpHHetJP6b1ISRhE tBPw== Received: by 10.50.237.41 with SMTP id uz9mr9855358igc.43.1347963019699; Tue, 18 Sep 2012 03:10:19 -0700 (PDT) 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.184.232 with SMTP id ex8csp365283igc; Tue, 18 Sep 2012 03:10:18 -0700 (PDT) Received: by 10.14.219.198 with SMTP id m46mr16685462eep.18.1347963017130; Tue, 18 Sep 2012 03:10:17 -0700 (PDT) Received: from eu1sys200aog114.obsmtp.com (eu1sys200aog114.obsmtp.com [207.126.144.137]) by mx.google.com with SMTP id m5si8608820een.135.2012.09.18.03.10.05 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Sep 2012 03:10:17 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.137 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.137; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.137 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 eu1sys200aob114.postini.com ([207.126.147.11]) with SMTP ID DSNKUFhIfG4W7WgVXgPUuotMVLWCkoX3gGex@postini.com; Tue, 18 Sep 2012 10:10:17 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 8BF751A4; Tue, 18 Sep 2012 10:09:52 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E95E92A73; Tue, 18 Sep 2012 10:09:51 +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 50138A8065; Tue, 18 Sep 2012 12:09:47 +0200 (CEST) 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, 18 Sep 2012 12:09:51 +0200 From: Linus Walleij To: , , Cc: Stephen Warren , Anmar Oueja , Patrice Chotard , Linus Walleij Subject: [PATCH] ARM: ux500: fix spi2 pin group Date: Tue, 18 Sep 2012 12:09:46 +0200 Message-ID: <1347962986-12280-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: ALoCoQnANh72hNfm77dnr4STw/tV7ES//P1YCermkjraL4hMUJKFqrytdXZZROCvHiKemmjmA9+B From: Patrice Chotard GPIO216_AG12 is configured as a gpio for SPI2, so select the spi2_oc1_2 pin group instead of spi2_oc1_1 Signed-off-by: Patrice Chotard Signed-off-by: Linus Walleij --- Hi Olof, Arnd: Again I'd prefer to take this through the pinctrl tree if it's OK with you. We are deploying pinctrl internally and ironing out bugs as we test more and more use cases. --- arch/arm/mach-ux500/board-mop500-pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index f0affc3..a96b945 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -219,7 +219,7 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = { DB8500_MUX("usb_a_1", "usb", "musb-ux500.0"), DB8500_PIN("GPIO257_AE29", out_hi, "musb-ux500.0"), /* STP */ /* Mux in SPI2 pins on the "other C1" altfunction */ - DB8500_MUX("spi2_oc1_1", "spi2", "spi2"), + DB8500_MUX("spi2_oc1_2", "spi2", "spi2"), DB8500_PIN("GPIO216_AG12", gpio_out_hi, "spi2"), /* FRM */ DB8500_PIN("GPIO218_AH11", in_pd, "spi2"), /* RXD */ DB8500_PIN("GPIO215_AH13", out_lo, "spi2"), /* TXD */