From patchwork Tue May 26 13:01:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 48989 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 28EDC2121F for ; Tue, 26 May 2015 13:44:55 +0000 (UTC) Received: by lbcak1 with SMTP id ak1sf234165lbc.2 for ; Tue, 26 May 2015 06:44:54 -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=1n0aRbEtbdJq7jEjss2wCX9Ck9SwChbSUP9FawvTUHA=; b=huU3tyll1GXcAWrzyOnXzZe5HeB7FK3nYVWWb+aoRVp6Jmz3+rWxWgjqVSzrUniCu7 jrdOFTpXN8bEVBy4emXQN/dV5eaJyZqre77WqaD1P68jeyPBcwEvJO99nflHGnSG8XpC mUm2fhkeGkAagoso62k3WIaWPWcxvJh5ASd1vycdLBBxTDd9eodTfJYVIHVOQY5ekcoK cM4D8L2G0uBScWcb39/B7ibUJX3sw/O+itVy52sI4E+jCjdImX1EvTAwIjftAn6zKaNI IHM4NfK/iCqkE2BnY8C4iEWEKePKcpLFKLlb+WC1G5fh37jTfySFdmGhWUUN1C/s5p8X DjvQ== X-Gm-Message-State: ALoCoQk8KI5TUrssUVI80vb85jWBP6mYBPhgJBTwZI7GntgjE4c9JErQ5nK4vSRFrb+h9rsL04Pu X-Received: by 10.152.26.134 with SMTP id l6mr27464216lag.10.1432647894010; Tue, 26 May 2015 06:44:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.103 with SMTP id l7ls159122laf.35.gmail; Tue, 26 May 2015 06:44:53 -0700 (PDT) X-Received: by 10.112.137.232 with SMTP id ql8mr3203512lbb.121.1432647893884; Tue, 26 May 2015 06:44:53 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id rb8si11014912lbb.34.2015.05.26.06.44.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2015 06:44:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lagv1 with SMTP id v1so67986058lag.3 for ; Tue, 26 May 2015 06:44:53 -0700 (PDT) X-Received: by 10.152.27.1 with SMTP id p1mr22394447lag.112.1432647893760; Tue, 26 May 2015 06:44:53 -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 hn6csp2561268lbb; Tue, 26 May 2015 06:44:52 -0700 (PDT) X-Received: by 10.68.198.101 with SMTP id jb5mr49668905pbc.84.1432647891234; Tue, 26 May 2015 06:44:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gy3si21016860pbb.86.2015.05.26.06.44.50; Tue, 26 May 2015 06:44:51 -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 S932487AbbEZNoe (ORCPT + 2 others); Tue, 26 May 2015 09:44:34 -0400 Received: from userp1050.oracle.com ([156.151.31.82]:43805 "EHLO userp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932450AbbEZNoa (ORCPT ); Tue, 26 May 2015 09:44:30 -0400 Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by userp1050.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t4QD3TYo019245 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 May 2015 13:03:30 GMT Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t4QD2NnL028925 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 May 2015 13:02:23 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t4QD2NdP021460 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 26 May 2015 13:02:23 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t4QD2LDY015523; Tue, 26 May 2015 13:02:23 GMT Received: from lappy.hsd1.nh.comcast.net (/10.154.191.32) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 26 May 2015 06:02:21 -0700 From: Sasha Levin To: stable@vger.kernel.org, stable-commits@vger.kernel.org Cc: Ulf Hansson , Linus Walleij , Sasha Levin Subject: [added to the 3.18 stable tree] ARM: ux500: Move GPIO regulator for SD-card into board DTSs Date: Tue, 26 May 2015 09:01:12 -0400 Message-Id: <1432645294-9185-29-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1432645294-9185-1-git-send-email-sasha.levin@oracle.com> References: <1432645294-9185-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: userp1040.oracle.com [156.151.31.81] 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.53 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.18 stable tree. If you have any objections, please let us know. =============== [ Upstream commit 53d2669844263fd5fdc70f0eb6a2eb8a21086d8e ] 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: Sasha Levin --- 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, 32 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index 9d23230..563640f 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -995,23 +995,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"; - }; - mcde@a0350000 { compatible = "stericsson,mcde"; reg = <0xa0350000 0x1000>, /* MCDE */ diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index bf8f0ed..8cf499a 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -111,6 +111,23 @@ pinctrl-1 = <&i2c3_sleep_mode>; }; + 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 3e97a66..eab23bf 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -146,8 +146,23 @@ }; vmmci: regulator-gpio { + compatible = "regulator-gpio"; + gpios = <&gpio7 4 0x4>; enable-gpio = <&gpio6 25 0x4>; + + 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