Commit 7b494cc4 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

arm64: dts: qcom: db820c: Group root nodes 



Prior refactoring have left a few root nodes scattered throughout
db820c.dtsi, group these at the top of the file.

Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent c61a5658

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

+45 −49
Original line number Diff line number Diff line
@@ -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 = <KEY_VOLUMEUP>;

			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 = <KEY_VOLUMEUP>;

			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 {