From patchwork Tue Jul 19 05:04:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhushan Shah X-Patchwork-Id: 9235911 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 80E8E6075D for ; Tue, 19 Jul 2016 05:06:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71DC2201F5 for ; Tue, 19 Jul 2016 05:06:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6691926B4A; Tue, 19 Jul 2016 05:06:53 +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 0B4A1201F5 for ; Tue, 19 Jul 2016 05:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752195AbcGSFGw (ORCPT ); Tue, 19 Jul 2016 01:06:52 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34205 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751505AbcGSFGu (ORCPT ); Tue, 19 Jul 2016 01:06:50 -0400 Received: by mail-pf0-f195.google.com with SMTP id g202so621626pfb.1; Mon, 18 Jul 2016 22:06:50 -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=nx22/mmpCGbFiILWSLBlpOBWUWxhGhl/Pg1/vVL9Hak=; b=FCQXrG4XxZVOzio/o+DdRBSovRmlJOzMUvyrnA0+dvIAArPpZSIq4L2u7jxwfJmLY1 +0DZMwGsI4cvSqJfcW3K2qe3aSUf8TEiN+8yj3iobFOgzfvLs6f9h9KBmcD/wN4BZf/7 ZAwD55NbBNvPtCnWTGLzVyslhtQVqLwpxqmVxN8KfclEXi3YEt08qQjBxbNr+gOBO3IG 4AxsEGxB7Po5gyjO01ybIw6pm/obIq+Mfp4YUQwXc0D2ykiF6wtXFVXyMWb/gYWzzC7V 7vrhJFa6tihty1uGxdpevfuikyKqiTnCIRpv15hFSWNjvlCCJbahnWzHxbXg3atV7oQ0 Zxug== X-Gm-Message-State: ALyK8tLyzv11K86njV22+Brcwxxu43EwhCl2iHfN/ku2u0dUKd0RF08+hMVVEVOHQNGSwA== X-Received: by 10.98.75.65 with SMTP id y62mr51496542pfa.99.1468904810080; Mon, 18 Jul 2016 22:06:50 -0700 (PDT) Received: from localhost.localdomain ([1.22.81.2]) by smtp.gmail.com with ESMTPSA id e10sm1596605pay.39.2016.07.18.22.06.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jul 2016 22:06:49 -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 v2 2/5] ARM: dts: msm8974: Move vreg_boost node from the honami to msm8974 Date: Tue, 19 Jul 2016 10:34:11 +0530 Message-Id: <20160719050414.31704-3-bshah@kde.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160719050414.31704-1-bshah@kde.org> References: <20160719050414.31704-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 --- arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 18 ++---------------- arch/arm/boot/dts/qcom-msm8974.dtsi | 11 +++++++++++ arch/arm/boot/dts/qcom-pm8941.dtsi | 6 ++++++ 3 files changed, 19 insertions(+), 16 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..8e33fc3 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,13 @@ }; }; - 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; - + vreg_boost { gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; pinctrl-0 = <&boost_bypass_n_pin>; - }; + }; }; &soc { @@ -383,11 +374,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..570028c 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -604,4 +604,15 @@ }; }; }; + + 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; + }; }; 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 {