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: 9540441 X-Patchwork-Delegate: agross@codeaurora.org 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 1CF39604AB for ; Fri, 27 Jan 2017 00:50:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D1D628305 for ; Fri, 27 Jan 2017 00:50:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01FE12830A; Fri, 27 Jan 2017 00:50:05 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A83E528305 for ; Fri, 27 Jan 2017 00:50:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752793AbdA0AuE (ORCPT ); Thu, 26 Jan 2017 19:50:04 -0500 Received: from mail-pf0-f179.google.com ([209.85.192.179]:33446 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752639AbdA0Asm (ORCPT ); Thu, 26 Jan 2017 19:48:42 -0500 Received: by mail-pf0-f179.google.com with SMTP id y143so69050538pfb.0 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=YA+81GzT7IP4KNnoFAhJLPZCbKXuIBtIIuOD5rdsWbaWXSUMS42BcsDZyzCmiW16Do l5RQKdPo7Y9tKmyihey/USkc5uOHOKwUQcACbt9Ee/bDyXQQvOo5DuXmIkTH+HYC4b9h 77yB8Irv6YrfOX1pUdpKyl0xfc5Bp50bo4kvqut7LZNm4y2Amnp3GrLYyLsUH7pf/0J4 hWjRt5gkDetLM47CLBT3dCAOaasuXn+dnbN7XLv5Ik8mtwApfaFyQfL8QfKqnPzXN/yX RzKC+oxythtDgchnQNMrZNOuQQ+PQLPHo7Rn5SpiJppyKOeEL3kW9kO1c7/zrLK1bZqn rIwQ== X-Gm-Message-State: AIkVDXIJrct4Z1xNdvLmM9WRzg4DjAfk5eXrOnUoXdK5mbNAgITS+piRUW2KwwSr5mRqkynu 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-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.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 {}; }; }; };