From patchwork Fri Jun 17 20:28:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 70380 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp457971qgy; Fri, 17 Jun 2016 13:28:40 -0700 (PDT) X-Received: by 10.98.33.138 with SMTP id o10mr4290404pfj.151.1466195315707; Fri, 17 Jun 2016 13:28:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e71si14173926pfg.248.2016.06.17.13.28.35; Fri, 17 Jun 2016 13:28:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753257AbcFQU2f (ORCPT + 8 others); Fri, 17 Jun 2016 16:28:35 -0400 Received: from mail-lf0-f44.google.com ([209.85.215.44]:33209 "EHLO mail-lf0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753398AbcFQU2e (ORCPT ); Fri, 17 Jun 2016 16:28:34 -0400 Received: by mail-lf0-f44.google.com with SMTP id f6so5247126lfg.0 for ; Fri, 17 Jun 2016 13:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EMkFafQXqlTqcUhRjtcmIwih6YvNGDLK803uNaIPUKc=; b=HgDU651elgmZK47Wnofnaac21E9+b0V8ewqXTcVnErbes9dA8bpYZU/oK6UsRdcSrb GXMlRiU1sPVAKc/dRRfHcGRqjmkBC/AzevVeV2xupxk0/HdzHuHdb4p44C6GZXbkFQnI yod0LKBNINnfVlMYkklvJm79tDeUf2BaCFRLk= 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=EMkFafQXqlTqcUhRjtcmIwih6YvNGDLK803uNaIPUKc=; b=Brl935TV0ystyhu1s/aX1T3WzkC5jH96YoxgATYF2sw0pyFOVIcmi9ANv/VryQi1yC vfA+sLgKlO4sHW9xCV5OvdRwGFw1GAe/Tqa1sBWaseg6yGqDBdS+xflZ31cbCDW5FBGm LDPs4TQchEat4AQntOC1QVtg/hX4K50lnRGQasj15WsDvA8CSuo6eCZiR1hrOlcETC4B CN6RrtXjaN12V9SNuz/Bw1omUAcCkg6E5q78qJfGBOOnhkfBAhAS4+rr1Sb/Al0AaWGd wfUyzQfWPwMS3pI9ur2Y37ksJJRzFVm5qGFoVnUuZ49zbFDv/fxJ2F9vpkm2fOoCxM7l P4PA== X-Gm-Message-State: ALyK8tKvKMX6XFaz81sjfYMILmGHY8+B+11NMBVJyDCpXeeI8G10d2wdekTRdSg6ypB+iBGu X-Received: by 10.25.209.129 with SMTP id i123mr1219672lfg.37.1466195312517; Fri, 17 Jun 2016 13:28:32 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-cc7c71d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.124.204]) by smtp.gmail.com with ESMTPSA id o7sm2366292lfg.45.2016.06.17.13.28.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jun 2016 13:28:31 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, Andy Gross Cc: Stephen Boyd , Bjorn Andersson , David Brown , Linus Walleij Subject: [PATCH 6/7] ARM: dts: move the fixed MMC regulator to SURF board Date: Fri, 17 Jun 2016 22:28:11 +0200 Message-Id: <1466195292-28236-8-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1466195292-28236-1-git-send-email-linus.walleij@linaro.org> References: <1466195292-28236-1-git-send-email-linus.walleij@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org There is currently a fixed regulator in the .dtsi file for the MSM8660 chipset, used by the SURF board. We want to define real regulators for a board using this chipset, so push the fixed regulator down to the SURF board which is the only user. Reviewed-by: Stephen Boyd Signed-off-by: Linus Walleij --- arch/arm/boot/dts/qcom-msm8660-surf.dts | 11 +++++++++++ arch/arm/boot/dts/qcom-msm8660.dtsi | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) -- 2.4.11 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts index b17f379e8c2a..23de764558ab 100644 --- a/arch/arm/boot/dts/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts @@ -23,15 +23,26 @@ }; }; + /* Temporary fixed regulator */ + vsdcc_fixed: vsdcc-regulator { + compatible = "regulator-fixed"; + regulator-name = "SDCC Power"; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; + regulator-always-on; + }; + amba { /* eMMC */ sdcc1: sdcc@12400000 { status = "okay"; + vmmc-supply = <&vsdcc_fixed>; }; /* External micro SD card */ sdcc3: sdcc@12180000 { status = "okay"; + vmmc-supply = <&vsdcc_fixed>; }; }; }; diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi index b7d7f0c27ba1..acbe71febe13 100644 --- a/arch/arm/boot/dts/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -315,15 +315,6 @@ }; }; - /* Temporary fixed regulator */ - vsdcc_fixed: vsdcc-regulator { - compatible = "regulator-fixed"; - regulator-name = "SDCC Power"; - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <2700000>; - regulator-always-on; - }; - amba { compatible = "simple-bus"; #address-cells = <1>; @@ -343,7 +334,6 @@ non-removable; cap-sd-highspeed; cap-mmc-highspeed; - vmmc-supply = <&vsdcc_fixed>; }; sdcc3: sdcc@12180000 { @@ -360,7 +350,6 @@ cap-mmc-highspeed; max-frequency = <48000000>; no-1-8-v; - vmmc-supply = <&vsdcc_fixed>; }; sdcc5: sdcc@12200000 { @@ -376,7 +365,6 @@ cap-sd-highspeed; cap-mmc-highspeed; max-frequency = <48000000>; - vmmc-supply = <&vsdcc_fixed>; }; };