Commit f978d45b authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

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: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 2e198c39

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

+29 −29
Original line number Diff line number Diff line
@@ -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 {