From patchwork Fri Jul 29 06:09:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhushan Shah X-Patchwork-Id: 9252107 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 7663760757 for ; Fri, 29 Jul 2016 06:10:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66F6327F89 for ; Fri, 29 Jul 2016 06:10:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B95227F96; Fri, 29 Jul 2016 06:10:12 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 E7D0427F89 for ; Fri, 29 Jul 2016 06:10:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752172AbcG2GKK (ORCPT ); Fri, 29 Jul 2016 02:10:10 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:36408 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750752AbcG2GKJ (ORCPT ); Fri, 29 Jul 2016 02:10:09 -0400 Received: by mail-pa0-f67.google.com with SMTP id ez1so4665336pab.3; Thu, 28 Jul 2016 23:10:09 -0700 (PDT) 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=MsP8jAIZOmWRKiXaNB2vtPn8SbPQcWEe2Enp+5LXkCA=; b=MGe1O6BfKg8IUJD1e8E0NAdXv1nZ1myBTLFkjd2NpsnivRk9obYa1pJsXqsUgfz9g3 NMS150bOR+JmZmBFXGBbMoc6S7M89Nz6wDI59xvamDVYrLXWvFbihf+FFonBybov8v+c MBm7JjFNoFei1oY4kkM/yeo5YrlDVXmpJqVNB2h6qeJeNZnPO28c2TzPJdai/qhVJ1Hz sJWg37fRgPoBG8hmbIMGHXQPnVd5QABWRf1xv6ROPKTl4cQnDT6bZo1aOSccjWnFJlNY T3VHHKRmCA+LGCXbQ9vAr1kAUJNUG1LtjFWSDR2kQvlmjlmjhyJi6RGpTDKoxzhY9tcU c6ug== X-Gm-Message-State: AEkoouvz1x444bQ7wDt5Jn4jwGNc4T/eXHe/Enlsu9LQ/xaDKuayL83GMLWXH8vVdQ7xEQ== X-Received: by 10.67.14.200 with SMTP id fi8mr65526483pad.93.1469772608556; Thu, 28 Jul 2016 23:10:08 -0700 (PDT) Received: from localhost.localdomain ([1.22.81.179]) by smtp.gmail.com with ESMTPSA id c8sm21414082pfe.39.2016.07.28.23.10.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jul 2016 23:10:08 -0700 (PDT) From: Bhushan Shah Cc: Bhushan Shah , Andy Gross , Bjorn Andersson , David Brown , Rob Herring , Mark Rutland , Russell King , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v3 2/5] ARM: dts: msm8974: Move vreg_boost node from the honami to msm8974 Date: Fri, 29 Jul 2016 11:39:07 +0530 Message-Id: <20160729060910.16943-3-bshah@kde.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160729060910.16943-1-bshah@kde.org> References: <20160729060910.16943-1-bshah@kde.org> To: unlisted-recipients:; (no To-header on input) 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 vreg_boost is Qualcomm platform specific and is also used in hammerhead device. Cc: Andy Gross Cc: Bjorn Andersson Cc: David Brown Cc: Rob Herring Cc: Mark Rutland Cc: Russell King Cc: linux-arm-msm@vger.kernel.org Cc: linux-soc@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: Bhushan Shah Reviewed-by: Bjorn Andersson --- Changes since v2: - Move vreg-boost node completely, along with pinctrl stuff .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 21 --------------------- arch/arm/boot/dts/qcom-msm8974.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/qcom-pm8941.dtsi | 6 ++++++ 3 files changed, 24 insertions(+), 21 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 a0398b6..a90e34c 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts @@ -258,22 +258,6 @@ }; }; - vreg_boost: vreg-boost { - compatible = "regulator-fixed"; - - regulator-name = "vreg-boost"; - regulator-min-microvolt = <3150000>; - regulator-max-microvolt = <3150000>; - - regulator-always-on; - regulator-boot-on; - - gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-names = "default"; - pinctrl-0 = <&boost_bypass_n_pin>; - }; }; &soc { @@ -383,11 +367,6 @@ }; gpios@c000 { - boost_bypass_n_pin: boost-bypass { - pins = "gpio21"; - function = "normal"; - }; - gpio_keys_pin_a: gpio-keys-active { pins = "gpio2", "gpio3", "gpio4", "gpio5"; function = "normal"; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index dc2ce00..1f9b649 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -2,6 +2,7 @@ #include #include +#include #include "skeleton.dtsi" / { @@ -604,4 +605,21 @@ }; }; }; + + vreg_boost: vreg-boost { + compatible = "regulator-fixed"; + + regulator-name = "vreg-boost"; + regulator-min-microvolt = <3150000>; + regulator-max-microvolt = <3150000>; + + regulator-always-on; + regulator-boot-on; + + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&boost_bypass_n_pin>; + }; }; diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi index d95edb6..ae8e5cc 100644 --- a/arch/arm/boot/dts/qcom-pm8941.dtsi +++ b/arch/arm/boot/dts/qcom-pm8941.dtsi @@ -88,6 +88,12 @@ <0 0xe1 0 IRQ_TYPE_NONE>, <0 0xe2 0 IRQ_TYPE_NONE>, <0 0xe3 0 IRQ_TYPE_NONE>; + + boost_bypass_n_pin: boost-bypass { + pins = "gpio21"; + function = "normal"; + }; + }; pm8941_mpps: mpps@a000 {