arm64: dts: qcom: db820c: Move non-soc entries out of /soc

The USB id pins and wlan regulator are not platform devices, so move
them out of /soc

Acked-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
index dba3488492f1b8a47a43cded73dca41e0b777d5d..da2f01eb3be2cbcbb76b1561f80371bd0160aabb 100644 (file)
--- 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 {