Merge "ARM: dts: qcom: Update GPIO/MPP child nodes properties for MDM9x07" (df36e143) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/mdm9607-mtp.dtsi

+39 −27

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@
		bluetooth: bt_qca6174 {
		compatible = "qca,qca6174";
		qca,bt-reset-gpio = <&pm8019_gpios 2 0>; /* BT_EN */
		pinctrl-names = "default";
		pinctrl-0 = <&bt_en_default>;
		qca,bt-vdd-pa-supply = <&rome_vreg>;
		qca,bt-vdd-io-supply = <&mdm9607_l11>;
		qca,bt-vdd-xtal-supply = <&mdm9607_l2>;
		@@ -76,57 +78,67 @@
		pins = "mpp2";
		function = "digital";
		input-enable;
		power-source = <3>;
		};
		};

		mpp@a300 { /* MPP 4 */
		emac_vreg {
		emac_vreg_default: emac_vreg_default { /* MPP 4 for emac_vreg*/
		pins = "mpp4";
		function = "digital";
		output-high;
		input-disable;
		power-source = <2>;
		};
		};
		};

		&pm8019_gpios {
		/* PMIC GPIO 1 for wlan power supply */
		wlan_en {
		wlan_en_default_wlan_en_default {
		pins = "gpio1";
		function = "normal";
		output-high;
		bias-pull-up;
		qcom,drive-strength = <1>;
		power-source = <1>;
		};
		};

		bt_en {
		bt_en_default: bt_en_default { /* BT_EN GPIO 2*/
		pins = "gpio2";
		function = "normal";
		output-low;
		input-disable;
		bias-pull-down;
		qcom,drive-strength = <2>;
		power-source = <1>;
		power-source = <2>;
		};
		};

		gpio@c300 { /* GPIO 4 */
		/* PMIC GPIO 3 for rome_vreg */
		rome_vreg {
		rome_vreg_default: rome_vreg_default {
		pins = "gpio3";
		function = "normal";
		output-high;
		input-disable;
		qcom,drive-strength = <1>;
		power-source = <3>;
		};
		};

		/* sdcard_ext_vreg GPIO 4 */
		sdcard_vreg {
		sdcard_vreg_default: sdcard_vreg_default {
		pins = "gpio4";
		function = "normal";
		output-high;
		bias-pull-up;
		input-disable;
		qcom,drive-strength = <1>;
		power-source = <1>;
		power-source = <0>;
		};
		};

		/* ROME 32k GPIO 6 Sleep Clock */
		gpio@c500 {
		pins = "gpio6";
		function = "normal";
		function = "func2";
		output-low;
		input-disable;
		bias-pull-down;
		qcom,drive-strength = <2>;
		power-source = <1>;
		power-source = <0>;
		};
		};

arch/arm64/boot/dts/qcom/mdm9607-regulator.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -392,6 +392,8 @@
		startup-delay-us = <250>;
		enable-active-high;
		gpio = <&pm8019_gpios 4 0>;
		pinctrl-names = "default";
		pinctrl-0 = <&sdcard_vreg_default>;
		};

		/* Rome 3.3V supply */
		@@ -401,6 +403,8 @@
		startup-delay-us = <4000>;
		enable-active-high;
		gpio = <&pm8019_gpios 3 0>;
		pinctrl-names = "default";
		pinctrl-0 = <&rome_vreg_default>;
		};

		emac_lan_vreg: emac_lan_vreg {
		@@ -409,5 +413,7 @@
		startup-delay-us = <250>;
		enable-active-high;
		gpio = <&pm8019_mpps 4 0>;
		pinctrl-names = "default";
		pinctrl-0 = <&emac_vreg_default>;
		};
		};

arch/arm64/boot/dts/qcom/mdm9607.dtsi

+4 −1

Original line number	Diff line number	Diff line
		@@ -677,6 +677,8 @@
		qcom,hsusb-otg-mode = <3>; /* OTG mode */
		qcom,hsusb-otg-otg-control = <2>; /* PMIC control */
		qcom,usbid-gpio = <&pm8019_mpps 1 0>;
		pinctrl-names = "default";
		pinctrl-0 = <&usb_id_default>;
		qcom,hsusb-log2-itc = <4>;
		qcom,dp-manual-pullup;
		qcom,boost-sysclk-with-streaming;
		@@ -1857,10 +1859,11 @@

		/* MPP pin 1 config for USB ID interrupt line */
		&pm8019_mpps {
		mpp@a000 {
		usb_id_default: usb_id_default {
		pins = "mpp1";
		function = "digital";
		input-enable;
		power-source = <3>;
		};
		};