From patchwork Thu May 24 18:01:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 10425279 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 BC95960545 for ; Thu, 24 May 2018 18:02:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95C8B29615 for ; Thu, 24 May 2018 18:02:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87F4D2963D; Thu, 24 May 2018 18:02:10 +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=unavailable 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 BF3C6296FD for ; Thu, 24 May 2018 18:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967086AbeEXSCD (ORCPT ); Thu, 24 May 2018 14:02:03 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:56302 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966518AbeEXSCC (ORCPT ); Thu, 24 May 2018 14:02:02 -0400 Received: by mail-wm0-f67.google.com with SMTP id a8-v6so7514428wmg.5 for ; Thu, 24 May 2018 11:02:02 -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=dWhkRPjzKu97yxr+BY7bTWzcepcDff2q3Tk6mOl0T9o=; b=ZOwQWvwdAJO9MGHKXD+c2djGQ+f4qSmgSNis+sqIYkEO8lfazojuSZdaYE143ZKCTp Zn7ce2DPTD1Av/IM0AlaEMrfkL8k9kh5oD21+/Krc23qsPYTbdklaGSPwEm2GfGVj6+o 6ud3qxr43FG4CjJZxNLCgMV4XV24afHbdv5RA= 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=dWhkRPjzKu97yxr+BY7bTWzcepcDff2q3Tk6mOl0T9o=; b=CIXPvJzY+XUh5ThI+JyLldn4DnRoeUuTv8kB4U0pFzDz8UZC5hXx2LUQIyXy/vlZYd l8DCUatQZ6iSQwMieeBMsQar1IdzNUbLiBVbl5GSAr5TfGLlM4yaVJYJfst8MDaEE3ay jYxNbVphlms0NVYeWXBmKzFNQEGC1+F226OhdjwZEd54hvpoDXXGxehwxMnAvWO4axWA HNa68wH/qRSVFC3F73NlH544dLzWx/dwb1yZcTnFdZw+9CnRLUQ0Miuc9QEI5JF/5wck uTlw4lSvxXrmuJXZkneMPEmBSVA6URl9cganX7td3wpAgxFzWwPC9Iq4joqQPwFAQ3mo 7iYg== X-Gm-Message-State: ALKqPwfIBefRSp35gO0zVWRcDat3lsknjXjy6UwEiEJ2fOVND8d8EhWl Adcr6N3XYekTKIhgUzFdwzIo9w== X-Google-Smtp-Source: AB8JxZqIZQq0cLTJFQPjebBJWGR+ZHu3JTFoyVM7JPPB3/HZJ7KhtGJBPKuwyvWHGq5VPHM+ak4BIw== X-Received: by 2002:a1c:c2d5:: with SMTP id s204-v6mr7850661wmf.40.1527184921559; Thu, 24 May 2018 11:02:01 -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 a129-v6sm5102891wme.34.2018.05.24.11.01.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 11:02:00 -0700 (PDT) From: Thierry Escande To: Andy Gross , David Brown , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon Cc: Bjorn Andersson , Niklas Cassel , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] arm64: dts: apq8096-db820c: Removed bt-en-1-8v regulator Date: Thu, 24 May 2018 20:01:55 +0200 Message-Id: <20180524180155.24839-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 Reviewed-by: Bjorn Andersson --- Change in v2: - Rebased on top of [1] posted a few days ago: [1] https://lkml.org/lkml/2018/5/22/949 "arm64: dts: fix regulator property name for wlan pcie endpoint" 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 7ca6e78def55..2c026b8af792 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-3v3-supply = <&wlan_en>; - vddpe1-supply = <&bt_en>; }; pcie@608000 {