From patchwork Thu May 24 17:38:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 10425231 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 7B2CB602D8 for ; Thu, 24 May 2018 17:38:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6694529549 for ; Thu, 24 May 2018 17:38:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B4B92954D; Thu, 24 May 2018 17:38:47 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, 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 CFC8B29549 for ; Thu, 24 May 2018 17:38:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967870AbeEXRip (ORCPT ); Thu, 24 May 2018 13:38:45 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:55015 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967118AbeEXRio (ORCPT ); Thu, 24 May 2018 13:38:44 -0400 Received: by mail-wm0-f68.google.com with SMTP id f6-v6so7360748wmc.4 for ; Thu, 24 May 2018 10:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfert-encoding; bh=imINqGWlnwxAzC3Xpo+chb3vgKpp97/TOhcEIu2894U=; b=dflAT2gzgEdOA3FZWN67MNGkCr3JHToqR54vUkrPmTmg42xG7QxiEdWcnK0dKr7hZV Wpp+ZR9/TOoJFplnkFjjVQ7b+8qoQp8i5lRBnaXcd7mwLa7VgTZebVjyiw1fztnCzApU YV3FivyH/V12PmNoPUHbB7lBAzm6Qt2sH4Myo= 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:mime-version :content-transfert-encoding; bh=imINqGWlnwxAzC3Xpo+chb3vgKpp97/TOhcEIu2894U=; b=YVc1WJ4EKULFOXK7N6j5TasHzRyF/y9p62LJGm54xfHDtq7CX52zKxtyHUyxlmrg1E 18hXJ1pxlY+vULm9BpW1Rd77RmQOh+yZNKbcbh3t5hTr/emnZX33ylI+ZZ87NTj3QcXc D5kVobTgmArHkYEl/BsWUny5WRRgvEmNyVtVbOCG5q3Bfg4FeBz6bJbHh0eDvVsAjXDc OHlz5XRPthxPwySTOc5NeNKxWChIrOM6VmXFrpUra+JIpfm8FeztVL46GB8IPDZJhTdv diuENo2R6ANB6CTD2RGnKmRY2WJx0Ad4gtJVMpJWAIWIKc8ey+jv72DqaL7WqLqI9gQJ Snzw== X-Gm-Message-State: ALKqPwfxeZrUYZaE6Mtp9jkjeltK0zBxeZ+VQsQNZ1mBRG2iWjIEncJy Uqj0hjoea2B1vfOPYrTXt1rz7w== X-Google-Smtp-Source: AB8JxZrvbrUYsvAyfpI9geCLhoAQSH8VsIl6Y8xP3g2EekDwcQPEOAfRjxqx0SAZHFas7q7T9La4Kg== X-Received: by 2002:a1c:6741:: with SMTP id b62-v6mr8026093wmc.0.1527183523352; Thu, 24 May 2018 10:38:43 -0700 (PDT) Received: from localhost.localdomain (mdy34-1-78-229-128-57.fbx.proxad.net. [78.229.128.57]) by smtp.gmail.com with ESMTPSA id 38-v6sm52140069wry.61.2018.05.24.10.38.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 10:38:42 -0700 (PDT) From: Thierry Escande To: Andy Gross , David Brown , Rob Herring Cc: Bjorn Andersson , Niklas Cassel , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: apq8096-db820c: Removed bt-en-1-8v regulator Date: Thu, 24 May 2018 19:38:36 +0200 Message-Id: <20180524173836.22719-1-thierry.escande@linaro.org> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 Content-Transfert-Encoding: 8bit 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 This patch removes the unused bt-en-1-8v regulator and moves the bt_en_gios claim to the pm8994_gpios node. This bt_en_gpio could have been moved to the bluetooth serial node but instead this node declares an 'enable' gpio addressing the bt_en_gpio. This is needed by the Qualcomm QCA6174 WLAN/BT combo chip that needs to have the bt_en_gpio claimed even if only WLAN is used. Signed-off-by: Thierry Escande --- arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 2 +- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi index 6167af955659..a6ad3d7fe655 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi @@ -4,7 +4,7 @@ &pm8994_gpios { pinctrl-names = "default"; - pinctrl-0 = <&ls_exp_gpio_f>; + pinctrl-0 = <&ls_exp_gpio_f &bt_en_gpios>; ls_exp_gpio_f: pm8994_gpio5 { pinconf { diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 8be666ea92bd..affd4486e10e 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -171,19 +171,6 @@ pinctrl-0 = <&usb2_vbus_det_gpio>; }; - bt_en: bt-en-1-8v { - pinctrl-names = "default"; - pinctrl-0 = <&bt_en_gpios>; - compatible = "regulator-fixed"; - regulator-name = "bt-en-regulator"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - - /* WLAN card specific delay */ - startup-delay-us = <70000>; - enable-active-high; - }; - wlan_en: wlan-en-1-8v { pinctrl-names = "default"; pinctrl-0 = <&wlan_en_gpios>; @@ -204,7 +191,6 @@ status = "okay"; perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>; vddpe-supply = <&wlan_en>; - vddpe1-supply = <&bt_en>; }; pcie@608000 {