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: 92550 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp10356qgi; Thu, 26 Jan 2017 16:48:55 -0800 (PST) X-Received: by 10.98.220.91 with SMTP id t88mr6222842pfg.78.1485478135522; Thu, 26 Jan 2017 16:48:55 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u123si702084pgc.280.2017.01.26.16.48.55; Thu, 26 Jan 2017 16:48:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753616AbdA0Asr (ORCPT + 25 others); Thu, 26 Jan 2017 19:48:47 -0500 Received: from mail-pf0-f174.google.com ([209.85.192.174]:34112 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752595AbdA0Asm (ORCPT ); Thu, 26 Jan 2017 19:48:42 -0500 Received: by mail-pf0-f174.google.com with SMTP id e4so68813913pfg.1 for ; Thu, 26 Jan 2017 16:47: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=rwra0gXrLHRWXccZMPCi0q3ZyeBtm/lZFv+JJETkNFTsAVlgveDw/k2iJB2Yu+uAG3 UNjzRu9RWvSms5GyecTX+5xfBJrlD9dHdbhK+lz2OuxzyMHDcxlw96nSlfXexef4d0uX pfUaMQztUv2khFScytsSeGDfMWPsRFSQYw9KEYIf1ZBor+DZgvoyeNkD3rZnr73klwKx lGBC2IYmqNDW5H1PpbZm/0piQTC2AlKlkoWMe+8OjBfO6jgmv0oHMiKo+lv4X1nN1+OW Ofs2swDUDTv8ndumI45aWjkXa/DCk36vTAWeCnAy+zVdsl8CXc2oiGbzfZIt4u/gWPWv HVnw== X-Gm-Message-State: AIkVDXLnSfvkLR1Lp2PJRtY+JHAEWwI2mJrPbK46nGVzVEcXF60kQcCFmoMJLG4cGWcdrkGl 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 Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 1 - arch/arm/boot/dts/qcom-msm8974.dtsi | 4 ---- 2 files changed, 5 deletions(-) -- 2.10.0.297.gf6727b0 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 {}; }; }; };