From patchwork Mon Oct 21 05:13:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 11201329 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E5D5B13BD for ; Mon, 21 Oct 2019 05:13:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C114C2084B for ; Mon, 21 Oct 2019 05:13:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tSvNo82P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727040AbfJUFNe (ORCPT ); Mon, 21 Oct 2019 01:13:34 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:46530 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726971AbfJUFNd (ORCPT ); Mon, 21 Oct 2019 01:13:33 -0400 Received: by mail-pf1-f193.google.com with SMTP id q5so7623918pfg.13 for ; Sun, 20 Oct 2019 22:13:33 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=eeCp14zFmkC1kLSVU5dKI3r3lBol6BgXW/DGHgVvGZ0=; b=tSvNo82PLkSNjEykRVz6Anf7ct/cSebykqJiQPuV071sDZmzpI1VIBRzmdXuiocOj6 cWgNp4aUe6Ue5r1lFGynCtgqtZ42DLRkjc7+TMQTAOa0sirqILEExsice4ymcWiFz90P qpJsqYt2EloQMeO996gwe/OVNchtjdbBOXM3IOEJgDR1ckFGjsPE/AbZzOA+OZqZN/Mw ejbb3qU3uFFHO5N8ikIQtVGCBKamPlTzTjCQG2TInhC/MKty+vKRtR/tzNH3wo8CjXx1 trpGeoypQteGjGcUjT7cJJDPvH549VolntT6HmNqMmsUdl8he95lRv4teb3SZHcnT0dC G6jQ== 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:mime-version:content-transfer-encoding; bh=eeCp14zFmkC1kLSVU5dKI3r3lBol6BgXW/DGHgVvGZ0=; b=uoXwkOmJjPRQUR6M4GK4L0W1m2RCjZQGNq++Bts0HxKsxyjxZASKOA7ks9gEi4cwVu CQRcyJNWHmjVD6V7rPk13eXZtO/eZhVy6WhGoQLL+RIS8bgVKz3nByJV6RYUObdW0Akz 8pHmCUB6mlB4FPUWnBajOKZrOCzgvZqm8soY9gPEFUdANeKgpygdm+0Y3JZLc5Egd4dY 3GKzit+D7bI+0U+kz3Sx29w1SJNtA/veUl0xVAXzS99bfcq65VLpLyZtUx3O5DQFAxg6 4o0Fe+7cHGXqM+btA1U3q4oSSWqi8eml2AMbXomBBh2QStWBqGnJ9B52NjLcn0v6iHdN RHYQ== X-Gm-Message-State: APjAAAUSzNvlRxG3GI7QbO8L9r+D0HpQP1D5DrOPanFuZ0AaBuqRV8Ih sPDStIZ/h8svrompD5DddG6zepGpWl8= X-Google-Smtp-Source: APXvYqyroXWQ9K2y77aGKRA8cLi4geZiYUAH17tiIIqDvZt3wyMXJEcPc1Cilu8IbkAMhpMJ56qiwg== X-Received: by 2002:a63:8ac8:: with SMTP id y191mr23636515pgd.324.1571634812754; Sun, 20 Oct 2019 22:13:32 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id h68sm15716862pfb.149.2019.10.20.22.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Oct 2019 22:13:31 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , Rob Herring , Mark Rutland Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] arm64: dts: qcom: db820c: Group root nodes Date: Sun, 20 Oct 2019 22:13:16 -0700 Message-Id: <20191021051322.297560-6-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191021051322.297560-1-bjorn.andersson@linaro.org> References: <20191021051322.297560-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Prior refactoring have left a few root nodes scattered throughout db820c.dtsi, group these at the top of the file. Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 94 ++++++++++---------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index fc6273b0215d..aed34a461b19 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -77,6 +77,51 @@ enable-gpios = <&pm8994_gpios 15 0>; }; }; + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + autorepeat; + + pinctrl-names = "default"; + pinctrl-0 = <&volume_up_gpio>; + + button@0 { + label = "Volume Up"; + linux,code = ; + gpios = <&pm8994_gpios 2 GPIO_ACTIVE_LOW>; + }; + }; + + usb2_id: usb2-id { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&pmi8994_gpios 6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb2_vbus_det_gpio>; + }; + + usb3_id: usb3-id { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&pm8994_gpios 22 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb3_vbus_det_gpio>; + }; + + wlan_en: wlan-en-1-8v { + pinctrl-names = "default"; + pinctrl-0 = <&wlan_en_gpios>; + compatible = "regulator-fixed"; + regulator-name = "wlan-en-regulator"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + gpio = <&pm8994_gpios 8 0>; + + /* WLAN card specific delay */ + startup-delay-us = <70000>; + enable-active-high; + }; }; &blsp1_uart1 { @@ -497,24 +542,6 @@ core-vcc-supply = <&pm8994_s4>; }; -/ { - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - autorepeat; - - pinctrl-names = "default"; - pinctrl-0 = <&volume_up_gpio>; - - button@0 { - label = "Volume Up"; - linux,code = ; - gpios = <&pm8994_gpios 2 GPIO_ACTIVE_LOW>; - }; - }; -}; - &rpm_requests { pm8994-regulators { compatible = "qcom,rpm-pm8994-regulators"; @@ -671,37 +698,6 @@ }; }; -/ { - usb2_id: usb2-id { - compatible = "linux,extcon-usb-gpio"; - id-gpio = <&pmi8994_gpios 6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&usb2_vbus_det_gpio>; - }; - - usb3_id: usb3-id { - compatible = "linux,extcon-usb-gpio"; - id-gpio = <&pm8994_gpios 22 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&usb3_vbus_det_gpio>; - }; - - wlan_en: wlan-en-1-8v { - pinctrl-names = "default"; - pinctrl-0 = <&wlan_en_gpios>; - compatible = "regulator-fixed"; - regulator-name = "wlan-en-regulator"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - - gpio = <&pm8994_gpios 8 0>; - - /* WLAN card specific delay */ - startup-delay-us = <70000>; - enable-active-high; - }; -}; - &spmi_bus { pmic@0 { pon@800 {