From patchwork Thu Dec 12 13:31:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3331901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4E12F9F374 for ; Thu, 12 Dec 2013 13:34:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD44920640 for ; Thu, 12 Dec 2013 13:34:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 532D4203AB for ; Thu, 12 Dec 2013 13:33:59 +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 1Vr6Nl-00072H-PA; Thu, 12 Dec 2013 13:32:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr6NU-0004KV-Lr; Thu, 12 Dec 2013 13:32:32 +0000 Received: from mail-la0-f52.google.com ([209.85.215.52]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr6N9-0004H2-2W for linux-arm-kernel@lists.infradead.org; Thu, 12 Dec 2013 13:32:12 +0000 Received: by mail-la0-f52.google.com with SMTP id y1so318226lam.11 for ; Thu, 12 Dec 2013 05:31:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=k0WCetHFnibhZM4zDRAgHkfCyKDTNrL18ABDg0Enuvs=; b=UPX57bO8rdnhVxeUPzwNuKyFSmZ/09eBJB+AMy7/WBQrJCjCEsKKGQblftvtlJVSfy k8MzDS2h4kvHXbOdMir+7DLmcCiVK26npe1OcAXDWXy/VCEnCZ+WsWeOMCRRhKLXOM3j mYST+qanzDCy+bEjRTHR6qxISkM7X+TRxGBS7iJ/9LleotROcchk5E/cWo70FVguDI7k JTpBoJqnCvkyR4IzOpLrIPSXXXx5lvjb34vn+GwW5vti6OmNPopeUebABc8GQzt4u89R G5fj7tLPUfT9nq1fgxjrizVE0vpdG8+BZm62pgy4eNomEDTMvTDAdZGS/LqpllD7VBhU kddQ== X-Gm-Message-State: ALoCoQkJFessklmQYb725R0u0Zhz6mnm2tL/JkIMLI+1dpKmIAtFM1/Hh/byGke1crMiG/KB0ouR X-Received: by 10.152.21.3 with SMTP id r3mr3770806lae.15.1386855108925; Thu, 12 Dec 2013 05:31:48 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id di11sm34838833lac.0.2013.12.12.05.31.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Dec 2013 05:31:48 -0800 (PST) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Linus Walleij Subject: [PATCH 2/3] ARM: ux500: Configure regulator for I/O voltage for SD-card slot Date: Thu, 12 Dec 2013 14:31:37 +0100 Message-Id: <1386855098-14272-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386855098-14272-1-git-send-email-ulf.hansson@linaro.org> References: <1386855098-14272-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131212_083211_281294_3F4D37BD X-CRM114-Status: GOOD ( 10.59 ) X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, Ulf Hansson , Lee Jones 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 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To be able to enable SDR12|25 for SD-cards, we needed to fixup the configuration in DT of the gpio regulator, which handles the signal voltage level. Some configuration were missing and some were wrong. Cc: Lee Jones Cc: devicetree@vger.kernel.org Signed-off-by: Ulf Hansson --- arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 -- arch/arm/boot/dts/ste-hrefv60plus.dtsi | 5 +++++ arch/arm/boot/dts/ste-snowball.dts | 6 ++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index af9914e..40f0ecd 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -68,8 +68,6 @@ vmmci: regulator-gpio { gpios = <&tc3589x_gpio 18 0x4>; enable-gpio = <&tc3589x_gpio 17 0x4>; - - status = "okay"; }; pinctrl { diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi index 1f7b46b..3b6d118 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi +++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi @@ -22,6 +22,11 @@ cd-gpios = <&gpio2 31 0x4>; // 95 }; + vmmci: regulator-gpio { + gpios = <&gpio0 5 0x4>; + enable-gpio = <&gpio5 9 0x4>; + }; + pinctrl { /* * Set this up using hogs, as time goes by and as seems fit, these diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 9070c37..97d5d21 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -146,10 +146,8 @@ }; vmmci: regulator-gpio { - gpios = <&gpio6 25 0x4>; - enable-gpio = <&gpio7 4 0x4>; - - status = "okay"; + gpios = <&gpio7 4 0x4>; + enable-gpio = <&gpio6 25 0x4>; }; // External Micro SD slot