From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Andy Gross <agross@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 01/11] arm64: dts: qcom: db820c: Move non-soc entries out of /soc
Date: Sun, 20 Oct 2019 22:13:12 -0700 [thread overview]
Message-ID: <20191021051322.297560-2-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20191021051322.297560-1-bjorn.andersson@linaro.org>
The USB id pins and wlan regulator are not platform devices, so move
them out of /soc
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 58 ++++++++++----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
index dba3488492f1..da2f01eb3be2 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
@@ -399,13 +399,6 @@
};
};
- 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>;
- };
-
usb@76f8800 {
status = "okay";
extcon = <&usb2_id>;
@@ -417,28 +410,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>;
- };
-
- 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;
- };
-
agnoc@0 {
pcie@600000 {
status = "okay";
@@ -667,6 +638,35 @@
};
};
};
+
+ 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 {
--
2.23.0
next prev parent reply other threads:[~2019-10-21 5:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 5:13 [PATCH 00/11] arm64: dts: qcom: msm8996: Introduce IFC6640 Bjorn Andersson
2019-10-21 5:13 ` Bjorn Andersson [this message]
2019-10-21 5:13 ` [PATCH 02/11] arm64: dts: qcom: msm8996: Use node references in db820c Bjorn Andersson
2019-10-21 5:13 ` [PATCH 03/11] arm64: dts: qcom: msm8996: Move regulator consumers to db820c Bjorn Andersson
2019-10-21 5:13 ` [PATCH 04/11] arm64: dts: qcom: msm8996: Move regulators " Bjorn Andersson
2019-10-21 5:13 ` [PATCH 05/11] arm64: dts: qcom: db820c: Group root nodes Bjorn Andersson
2019-10-21 5:13 ` [PATCH 06/11] arm64: dts: qcom: db820c: Sort all nodes Bjorn Andersson
2019-10-21 5:13 ` [PATCH 07/11] arm64: dts: qcom: db820c: Remove pin specific files Bjorn Andersson
2019-10-21 5:13 ` [PATCH 08/11] arm64: dts: qcom: msm8996: Pad addresses Bjorn Andersson
2019-10-21 5:13 ` [PATCH 09/11] arm64: dts: qcom: msm8996: Sort all nodes in msm8996.dtsi Bjorn Andersson
2019-10-21 5:13 ` [PATCH 10/11] arm64: dts: qcom: db820c: Use regulator names from schematics Bjorn Andersson
2019-10-21 5:13 ` [PATCH 11/11] arm64: dts: qcom: msm8996: Introduce IFC6640 Bjorn Andersson
2019-11-03 8:13 ` [PATCH 00/11] " Vinod Koul
2019-11-04 4:55 ` Bjorn Andersson
2019-11-04 9:27 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191021051322.297560-2-bjorn.andersson@linaro.org \
--to=bjorn.andersson@linaro.org \
--cc=agross@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).