From patchwork Sat May 16 07:38:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 48592 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9E1EE21411 for ; Sat, 16 May 2015 07:43:29 +0000 (UTC) Received: by wgtl5 with SMTP id l5sf37028831wgt.1 for ; Sat, 16 May 2015 00:43:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=Kj+gkHNOFOwvBEhDQ55x0Gj8XlAfdVIl705RuBRWdfI=; b=cPMBGTkNZmG0yRa6uVgnlfZubPtWyr5GrZiN0sRZirdSfxRopdWIYHxENXzj4TK4cE TOfDvxvMLchpcLaMCLrbwWC1oyyblrIsHtBEIqAarcej06M19rg4sImnUroQpi9hsL2i ihZ6JwmWdu+WEd+cq2I5zPInWbIzWCgV7JWVGAp3ycuvuFSx1o78AN3ONdVNhtPEsNu7 wpHozgaEn9lX43tEjAKKvLQSJOQUW4aNVdUdNHAEYG2S7D1IAD5YL3eBcrinGBSNl7QQ GFWTlE+78QFXEqsy8wg9rbkIk4NY5lESDlX3UcTckjyEGQlJfQmJbe9ruw8I+VlXKOHV DXHA== X-Gm-Message-State: ALoCoQnEKvnVdiIkVwrkkQSgB6xw0WNhwzHWlqarlP8lIwSH1YaxYQdUhP5ymv+dFq5uskMy59AL X-Received: by 10.113.11.3 with SMTP id ee3mr9984659lbd.9.1431762208975; Sat, 16 May 2015 00:43:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.179.39 with SMTP id dd7ls641846lac.60.gmail; Sat, 16 May 2015 00:43:28 -0700 (PDT) X-Received: by 10.152.21.5 with SMTP id r5mr671662lae.24.1431762208860; Sat, 16 May 2015 00:43:28 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id ku8si2584648lac.87.2015.05.16.00.43.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 May 2015 00:43:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by lagv1 with SMTP id v1so153012414lag.3 for ; Sat, 16 May 2015 00:43:28 -0700 (PDT) X-Received: by 10.112.222.133 with SMTP id qm5mr10064951lbc.86.1431762208769; Sat, 16 May 2015 00:43:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2542725lbb; Sat, 16 May 2015 00:43:27 -0700 (PDT) X-Received: by 10.66.181.136 with SMTP id dw8mr25478814pac.90.1431762178662; Sat, 16 May 2015 00:42:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j2si6203239pdr.77.2015.05.16.00.42.57; Sat, 16 May 2015 00:42:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933850AbbEPHlI (ORCPT + 2 others); Sat, 16 May 2015 03:41:08 -0400 Received: from bband-dyn183.178-41-215.t-com.sk ([178.41.215.183]:21798 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933984AbbEPHjD (ORCPT ); Sat, 16 May 2015 03:39:03 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YtWfv-0005Hg-VF; Sat, 16 May 2015 09:38:23 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ulf Hansson , Linus Walleij , Jiri Slaby Subject: [PATCH 3.12 127/142] ARM: ux500: Move GPIO regulator for SD-card into board DTSs Date: Sat, 16 May 2015 09:38:07 +0200 Message-Id: <9e52c9e0ce899403f788a939325fdfe4f5d008e4.1431761807.git.jslaby@suse.cz> X-Mailer: git-send-email 2.3.7 In-Reply-To: <70c3d4ae1322b9e9bd7443ef574af5635234a0fa.1431761807.git.jslaby@suse.cz> References: <70c3d4ae1322b9e9bd7443ef574af5635234a0fa.1431761807.git.jslaby@suse.cz> In-Reply-To: References: Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Ulf Hansson 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 53d2669844263fd5fdc70f0eb6a2eb8a21086d8e upstream. The GPIO regulator for the SD-card isn't a ux500 SOC configuration, but instead it's specific to the board. Move the definition of it, into the board DTSs. Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by default") Signed-off-by: Ulf Hansson Reviewed-by: Bjorn Andersson Signed-off-by: Linus Walleij Signed-off-by: Jiri Slaby --- arch/arm/boot/dts/ste-dbx5x0.dtsi | 17 ----------------- arch/arm/boot/dts/ste-href.dtsi | 17 +++++++++++++++++ arch/arm/boot/dts/ste-snowball.dts | 15 ++++++++++++++- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index 1c1091eedade..faa64cd3ab73 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -774,23 +774,6 @@ status = "disabled"; }; - vmmci: regulator-gpio { - compatible = "regulator-gpio"; - - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2900000>; - regulator-name = "mmci-reg"; - regulator-type = "voltage"; - - startup-delay-us = <100>; - enable-active-high; - - states = <1800000 0x1 - 2900000 0x0>; - - status = "disabled"; - }; - cryp@a03cb000 { compatible = "stericsson,ux500-cryp"; reg = <0xa03cb000 0x1000>; diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index 370e03f5e7b2..b2d900157bb4 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -106,6 +106,23 @@ }; }; + vmmci: regulator-gpio { + compatible = "regulator-gpio"; + + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2900000>; + regulator-name = "mmci-reg"; + regulator-type = "voltage"; + + startup-delay-us = <100>; + enable-active-high; + + states = <1800000 0x1 + 2900000 0x0>; + + status = "disabled"; + }; + // External Micro SD slot sdi0_per1@80126000 { arm,primecell-periphid = <0x10480180>; diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index f1fc128e249d..3d85253369c7 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -121,10 +121,23 @@ }; vmmci: regulator-gpio { + compatible = "regulator-gpio"; + gpios = <&gpio6 25 0x4>; enable-gpio = <&gpio7 4 0x4>; - status = "okay"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2900000>; + regulator-name = "mmci-reg"; + regulator-type = "voltage"; + + startup-delay-us = <100>; + enable-active-high; + + states = <1800000 0x1 + 2900000 0x0>; + + status = "disabled"; }; // External Micro SD slot