From patchwork Fri Jan 27 00:47:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9540431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E75B601D7 for ; Fri, 27 Jan 2017 00:49:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D3D02817F for ; Fri, 27 Jan 2017 00:49:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80D6428305; Fri, 27 Jan 2017 00:49:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2B0EF2817F for ; Fri, 27 Jan 2017 00:49:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cWuja-000355-Dl; Fri, 27 Jan 2017 00:49:46 +0000 Received: from mail-pf0-f182.google.com ([209.85.192.182]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cWuii-0002nL-Se for linux-arm-kernel@lists.infradead.org; Fri, 27 Jan 2017 00:48:54 +0000 Received: by mail-pf0-f182.google.com with SMTP id f144so69028867pfa.2 for ; Thu, 26 Jan 2017 16:48:32 -0800 (PST) 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=c7INaNtxaukRBOSOGvyh5bqKn1kAhylffaU35H9tPSY=; b=JrZFkzvg2QHGCU43TLr+UxRHsJ/wBATK5DzbeHXp7MTq34kYoqAm7oERYvV6aYtkc+ 5rADaFvYRClg2qEKV6UaLFr51LDBGg8lysoZnpmncEahzov5sxQqdHXbml9Qs4hxS1RF zABnLeouu7dbogVSRKvu5fRR1Sx+tfLpjIBUM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=c7INaNtxaukRBOSOGvyh5bqKn1kAhylffaU35H9tPSY=; b=ZbJFHSk1x0SeKBFTZBzcR/uv3H9jQ8uKIzoFAwoylOQUKuM1wROX5J1ZcASAwiopuY akn4jR+hWl4Fb5s0cxqW1IPbXIB484EnrxUuti/gCF3PEh7j/6qw5yT8PNj2iL6d5bSB CjbIV2/pYd6qY4cedQTgKtPIaAcE5lpEHetP330jF+qqQESHyd5XfHjKd664CGtxtVNX lgHS1r1vB3Ile6Ogw3tb8j4ICTQmrNVLOrvGTs5zVI88Pp1m2YvszZYk+nlaZGhyUKga mpAIRL8PAeptUcmB7gasnEpCvb02cRF1rGhjSGXDUZpeOPy7pN5KAx2GPMRS0LeEIg0v L+Tw== X-Gm-Message-State: AIkVDXLUf5ad1M1vmSyLpTHkT+zeLtf21FmDrE7YvcbX5aCY8e0MQ5nMkGaq8s0XHzC48VPU X-Received: by 10.99.101.4 with SMTP id z4mr6440829pgb.208.1485478052065; Thu, 26 Jan 2017 16:47:32 -0800 (PST) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id k184sm6016152pgc.23.2017.01.26.16.47.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jan 2017 16:47:31 -0800 (PST) From: Stephen Boyd To: Andy Gross Subject: [PATCH 1/5] ARM: dts: qcom: Remove s4/5vs1, 2 from RPM pm8941 control Date: Thu, 26 Jan 2017 16:47:24 -0800 Message-Id: <20170127004728.22490-2-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.10.0.297.gf6727b0 In-Reply-To: <20170127004728.22490-1-stephen.boyd@linaro.org> References: <20170127004728.22490-1-stephen.boyd@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170126_164852_953137_82475933 X-CRM114-Status: UNSURE ( 9.41 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bjorn Andersson MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP These regulators are controlled by the SPMI regulator driver instead of the RPM regulator driver in the downstream android kernel sources. Let's remove them from the DTS here because they'll never be used by the RPM regulator driver. Cc: Bjorn Andersson Signed-off-by: Stephen Boyd Acked-by: Bjorn Andersson --- arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 1 - arch/arm/boot/dts/qcom-msm8974.dtsi | 4 ---- 2 files changed, 5 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts index e7c1577d56f4..50966378f9e4 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts @@ -92,7 +92,6 @@ vdd_l9_l10_l17_l22-supply = <&vreg_boost>; vdd_l13_l20_l23_l24-supply = <&vreg_boost>; vdd_l21-supply = <&vreg_boost>; - vin_5vs-supply = <&pm8941_5v>; s1 { regulator-min-microvolt = <1300000>; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 0e9bbede860d..6c167c031368 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -735,7 +735,6 @@ pm8941_s1: s1 {}; pm8941_s2: s2 {}; pm8941_s3: s3 {}; - pm8941_5v: s4 {}; pm8941_l1: l1 {}; pm8941_l2: l2 {}; @@ -765,9 +764,6 @@ pm8941_lvs1: lvs1 {}; pm8941_lvs2: lvs2 {}; pm8941_lvs3: lvs3 {}; - - pm8941_5vs1: 5vs1 {}; - pm8941_5vs2: 5vs2 {}; }; }; };