From patchwork Mon Apr 20 14:02:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 47360 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6C57020553 for ; Mon, 20 Apr 2015 14:02:53 +0000 (UTC) Received: by layy10 with SMTP id y10sf39287121lay.0 for ; Mon, 20 Apr 2015 07:02:52 -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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=WGUvTWYF25QBEpHZnrTFAfZC2W/x1e5ohubAt1CmB/A=; b=D6W9OXCdhx4+VoqIfAfja0WoyRon6YBF/t8w2JxCxKE02mATWF571UQRdNh9ljnS3T rkTSBCfIcSJ5PKegXmBZfpJ8UxLp9YGCBJGhOaLaPsE6d57gfC4GNpnbHc131FCz3tKi 0uyHTjU0DcmpxMQEDpgPmxZS2MDoRRr4xAGmarm9k8rWiRrco03cNohk2fHXzwkh5R2d ez1A/3UCm6HoW3kg1D6P7xy/I3aKv/L6JgdR8vPyD2QEQVH/BVYgUZWsIariw32JHx3m Efy/dqmbacXzLIFqOruE5rxT7bk6/nEKwN9a9RqoQohGhTejNiv8xZVmmGrxqmzl72VE glew== X-Gm-Message-State: ALoCoQmc4iU0IJbubW6qcDE4Muad0FlxLCGnHTrOeP2xBR4+KxglNc6xfzfS0ozKoPvERyFYI0v7 X-Received: by 10.180.106.10 with SMTP id gq10mr6112201wib.0.1429538572449; Mon, 20 Apr 2015 07:02:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.22.134 with SMTP id d6ls776718laf.95.gmail; Mon, 20 Apr 2015 07:02:52 -0700 (PDT) X-Received: by 10.152.44.161 with SMTP id f1mr15758000lam.26.1429538572285; Mon, 20 Apr 2015 07:02:52 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id ur10si15096476lbb.12.2015.04.20.07.02.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 07:02:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbcga7 with SMTP id ga7so131460520lbc.1 for ; Mon, 20 Apr 2015 07:02:52 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr15588529lac.41.1429538572195; Mon, 20 Apr 2015 07:02:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.67.65 with SMTP id l1csp40584lbt; Mon, 20 Apr 2015 07:02:51 -0700 (PDT) X-Received: by 10.152.10.180 with SMTP id j20mr16111540lab.54.1429538571758; Mon, 20 Apr 2015 07:02:51 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id es16si15069716lbc.122.2015.04.20.07.02.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 07:02:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbbzk7 with SMTP id zk7so131381053lbb.0 for ; Mon, 20 Apr 2015 07:02:51 -0700 (PDT) X-Received: by 10.112.211.134 with SMTP id nc6mr15545427lbc.52.1429538571630; Mon, 20 Apr 2015 07:02:51 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ml10sm4341511lbc.29.2015.04.20.07.02.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Apr 2015 07:02:50 -0700 (PDT) From: Ulf Hansson To: Linus Walleij Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Lee Jones , Bjorn Andersson , Ulf Hansson Subject: [PATCH 1/3] ARM: ux500: Move GPIO regulator for SD-card into board DTSs Date: Mon, 20 Apr 2015 16:02:31 +0200 Message-Id: <1429538553-17366-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429538553-17366-1-git-send-email-ulf.hansson@linaro.org> References: <1429538553-17366-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@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.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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 bfd3f1c..2201cd5 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -1017,23 +1017,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 206826a..65a7f63 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