From patchwork Tue Mar 26 23:32:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Press X-Patchwork-Id: 2346981 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id E16203FD40 for ; Wed, 27 Mar 2013 00:18:13 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UKdzx-0007gj-6t; Wed, 27 Mar 2013 00:13:49 +0000 Received: from mail-ob0-x22d.google.com ([2607:f8b0:4003:c01::22d]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UKdzt-0007gH-3J for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2013 00:13:45 +0000 Received: by mail-ob0-f173.google.com with SMTP id dn14so7780867obc.18 for ; Tue, 26 Mar 2013 17:13:40 -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=ol9tKsRojQzxr2StnEfPHdS+DnCOcz8COb6muqA8XtY=; b=ZPP7/pIhQmjb6ntkwYmytbVy6qdghiNTK27TZ0Og138Xo683RfsAotqAVvyosNJKMT I4fA1/hTvzedvBiZT9wGgJVbbFXbJpaMOiziHomhYE6noTtbceSerOt+2xiIuRm3d9Yx c6X6lokCyUTJe0JSx9i+zKl4i7Tj/HsIC67FTPUyWs8IyftFnNRTqXKvJ02/2jUrZ9Zk aLG4Ap5m/EW6g6aTrhD4gY9b/iSCqIA0uCKIxRZttVZyeD2xzVOG19B0nVoQddvzO4Ew LkZCIxSGPFC7/pqC4ZAZZ73BV35Ai19gldh5GhC5iwokzHZGY2viEoS+JAEq1SkD4SCt kgcQ== X-Received: by 10.60.144.226 with SMTP id sp2mr530329oeb.64.1364343220658; Tue, 26 Mar 2013 17:13:40 -0700 (PDT) Received: from archimedes.gateway.2wire.net (108-230-157-199.lightspeed.sntcca.sbcglobal.net. [108.230.157.199]) by mx.google.com with ESMTPS id a10sm20105890oez.1.2013.03.26.17.13.38 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Mar 2013 17:13:39 -0700 (PDT) Received: from archimedes.gateway.2wire.net (localhost [127.0.0.1]) by archimedes.gateway.2wire.net (8.14.4/8.14.4/Debian-2.1ubuntu2) with ESMTP id r2QNpTHW012299; Tue, 26 Mar 2013 16:51:29 -0700 Received: (from root@localhost) by archimedes.gateway.2wire.net (8.14.4/8.14.4/Submit) id r2QNWW0M010629; Tue, 26 Mar 2013 16:32:32 -0700 From: Ryan Press To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm: mvebu: Fix pinctrl for Armada 370 Mirabox SDIO port. Date: Tue, 26 Mar 2013 16:32:31 -0700 Message-Id: <1364340751-10585-1-git-send-email-ryan@presslab.us> X-Mailer: git-send-email 1.8.1.2 X-Gm-Message-State: ALoCoQlwwYnmvLpQVY8P7fFpqvMfArar3HvgluMu4WZuG1uOYOi4BuDxzXc7+aEQwm74TtI92vV9 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130326_201345_199124_B6B0786C X-CRM114-Status: GOOD ( 11.59 ) 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 ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: thomas.petazzoni@free-electrons.com, Ryan Press 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 The previous configuration used the wrong "clk" pin. Without this change mv_sdio worked because the bootloader would set the pin up, but with a bootloader that does not set the pin, mv_sdio fails to detect any card. I have tested this change using a mwifiex_sdio wireless network adapter over the SDIO interface. Signed-off-by: Ryan Press --- arch/arm/boot/dts/armada-370-mirabox.dts | 2 +- arch/arm/boot/dts/armada-370.dtsi | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index dd0c57d..3234875 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts @@ -54,7 +54,7 @@ }; mvsdio@d00d4000 { - pinctrl-0 = <&sdio_pins2>; + pinctrl-0 = <&sdio_pins3>; pinctrl-names = "default"; status = "okay"; /* diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 8188d13..a195deb 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -59,6 +59,12 @@ "mpp50", "mpp51", "mpp52"; marvell,function = "sd0"; }; + + sdio_pins3: sdio-pins3 { + marvell,pins = "mpp48", "mpp49", "mpp50", + "mpp51", "mpp52", "mpp53"; + marvell,function = "sd0"; + }; }; gpio0: gpio@d0018100 {