From patchwork Tue Jun 14 15:30:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 70046 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2110454qgf; Tue, 14 Jun 2016 08:31:31 -0700 (PDT) X-Received: by 10.107.18.35 with SMTP id a35mr36571523ioj.116.1465918289491; Tue, 14 Jun 2016 08:31:29 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1si39136555pfb.251.2016.06.14.08.31.29; Tue, 14 Jun 2016 08:31:29 -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 S1751442AbcFNPb2 (ORCPT + 8 others); Tue, 14 Jun 2016 11:31:28 -0400 Received: from mail-lf0-f47.google.com ([209.85.215.47]:34772 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750977AbcFNPb1 (ORCPT ); Tue, 14 Jun 2016 11:31:27 -0400 Received: by mail-lf0-f47.google.com with SMTP id j7so83010515lfg.1 for ; Tue, 14 Jun 2016 08:31:27 -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=M1MZdibikVR+wlbKRX9zJ7f3BHkjtOjfO5dizLuRukU=; b=gZZaLH2ZF3m8lVaPphytP9nhClujl9jdWBVhMHWr8/kmUxa+v2CCcwuOjxPTYTser6 veyuCrtA53jYgivbVGcasrYVfBRUk2eo9kX9uU/B1WULqTmA9WYPsdpXp6f46KTW6tyi C1CxZQ1Hvysrl1D4CRdrYeXOG8bgdupzkWyCY= 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=M1MZdibikVR+wlbKRX9zJ7f3BHkjtOjfO5dizLuRukU=; b=UpAvs8j2zFrVXMcPm/wznG7GZt0F+yrjJ39iVxC2osTZpt6+W9ciJy1EbPPJ+5KEYW 7ylK/eKTRMmTA1AisjC35LZayEKusv/9WCeYPTWxBdCOs+8845hqteeaQ6GJl2xyJXjQ Z+UIF9TBjC6C44+Abu3EBqoqKVVxu4/EzEI3ff7sY/HkFkKW46bhQAP/aOj8RoMoMpwc fPuSDSUpZ5SQqwnA/qbYH1K57L20yGvA9SWrYgMNO94sWRgaxGDtLQzmcPpy3nG85cw1 JY6eo7rOECOgdM2NGNGxT8VvajWrhzABjUWnCvEFz6RvSw5EuKwFsaEUHYR7XrR4brNA s9ow== X-Gm-Message-State: ALyK8tJ8ySXaHL7k1FirPPi2WVJ7Uj8mukmiPeme+NX2bmTCYXvhVqUKMNTk5g5jucO7XWiX X-Received: by 10.46.5.208 with SMTP id 199mr969966ljf.12.1465918286356; Tue, 14 Jun 2016 08:31:26 -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 e32sm2266067lji.41.2016.06.14.08.31.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jun 2016 08:31:25 -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 4/5] ARM: dts: move the fixed MMC regulator to SURF board Date: Tue, 14 Jun 2016 17:30:58 +0200 Message-Id: <1465918259-11138-5-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1465918259-11138-1-git-send-email-linus.walleij@linaro.org> References: <1465918259-11138-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. 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 51d3c9e70617..088b48fdf75d 100644 --- a/arch/arm/boot/dts/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -304,15 +304,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>; @@ -332,7 +323,6 @@ non-removable; cap-sd-highspeed; cap-mmc-highspeed; - vmmc-supply = <&vsdcc_fixed>; }; sdcc3: sdcc@12180000 { @@ -349,7 +339,6 @@ cap-mmc-highspeed; max-frequency = <48000000>; no-1-8-v; - vmmc-supply = <&vsdcc_fixed>; }; sdcc5: sdcc@12200000 { @@ -365,7 +354,6 @@ cap-sd-highspeed; cap-mmc-highspeed; max-frequency = <48000000>; - vmmc-supply = <&vsdcc_fixed>; }; };