From patchwork Sat May 16 07:18:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 48595 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 696E22121F for ; Sat, 16 May 2015 08:46:51 +0000 (UTC) Received: by wgtl5 with SMTP id l5sf37336909wgt.1 for ; Sat, 16 May 2015 01:46:50 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=lYc8Yy6D0rqJQqPXYYAYEm+ksl9sHzAj3298r/JC650=; b=S7zS2CToW7PjBodPHnlJR0cPyW2gnWwzb5t3x4vs2YEALnDQJagPRQw4qhVM6wIY2u UmeymjwXV4c834Llos4UzGuYRxF6TBtSrgbdbpFwIFEIHgrJQ8rIWCKHv4/HJMnKEUj3 oy6ffdvnUck2wcGXcS93D+cV7Vk6QJOS2F+yMNNJF5oKR6/WCV69Um8sALjSbo3I9T7Q zOdah32HjtFaTqckSO8thNCTxg55yyLQ1Eh4zZdxsRbzPSoLxhnweOkXKzbdlXKP0BBy BPUS6HRkRKGe+9vqF8u77F5oiA0sSj0XdXZxerFz0HwKfzKEb5/i+y5uFzGsFtRceNMK 85UA== X-Gm-Message-State: ALoCoQl6hai4meqF3v2+eHvErnuBidCWZq4JCSJ07x7nwcW+Ha+IC0EX3jlTbHsN0/H2P44AV+dv X-Received: by 10.180.97.9 with SMTP id dw9mr2204208wib.2.1431766010676; Sat, 16 May 2015 01:46:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.163 with SMTP id an3ls637189lac.90.gmail; Sat, 16 May 2015 01:46:50 -0700 (PDT) X-Received: by 10.152.2.38 with SMTP id 6mr10300757lar.80.1431766010545; Sat, 16 May 2015 01:46:50 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id rs2si2662138lbb.106.2015.05.16.01.46.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 May 2015 01:46:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by labbd9 with SMTP id bd9so154536568lab.2 for ; Sat, 16 May 2015 01:46:50 -0700 (PDT) X-Received: by 10.112.198.74 with SMTP id ja10mr10164321lbc.19.1431766010422; Sat, 16 May 2015 01:46:50 -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 hn6csp2576679lbb; Sat, 16 May 2015 01:46:49 -0700 (PDT) X-Received: by 10.66.117.233 with SMTP id kh9mr26224157pab.103.1431766003401; Sat, 16 May 2015 01:46:43 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sa6si6243314pbb.125.2015.05.16.01.46.42; Sat, 16 May 2015 01:46:43 -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 S2992539AbbEPIX6 (ORCPT + 2 others); Sat, 16 May 2015 04:23:58 -0400 Received: from bband-dyn183.178-41-215.t-com.sk ([178.41.215.183]:22906 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2993046AbbEPISg (ORCPT ); Sat, 16 May 2015 04:18:36 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YtWN9-0004t7-W5; Sat, 16 May 2015 09:18:59 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Ulf Hansson , Linus Walleij , Jiri Slaby Subject: [patch added to the 3.12 stable tree] ARM: ux500: Move GPIO regulator for SD-card into board DTSs Date: Sat, 16 May 2015 09:18:44 +0200 Message-Id: <1431760739-18709-7-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.3.7 In-Reply-To: <1431760739-18709-1-git-send-email-jslaby@suse.cz> References: <1431760739-18709-1-git-send-email-jslaby@suse.cz> 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.46 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 This patch has been added to the 3.12 stable tree. If you have any objections, please let us 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