Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef97c0fc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: msm8992: Add BT node, GPIO regulator"

parents e824fa42 0cb6aafc

arch/arm/boot/dts/qcom/msm8992-cdp.dtsi

+45 −0
Original line number Diff line number Diff line
@@ -130,6 +130,19 @@ 
	pinctrl-4 = <&mdss_hdmi_hpd_suspend &mdss_hdmi_ddc_suspend

						&mdss_hdmi_cec_suspend>;

};



/ {

	bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&pm8994_gpios 19 0>; /* BT_EN */

		qca,bt-vdd-pa-supply = <&bt_vreg>;

		qca,bt-vdd-io-supply = <&pm8994_s4>;

		qca,bt-vdd-xtal-supply = <&pm8994_l30>;

		qca,bt-vdd-io-voltage-level = <1800000 1800000>;

		qca,bt-vdd-xtal-voltage-level = <1800000 1800000>;

	};

};



&blsp1_uart2 {

	status= "ok";

	pinctrl-names = "default";
@@ -256,6 +269,38 @@ 
		qcom,master-en = <1>;

		status = "okay";

        };



	gpio@c800 { /* GPIO 9 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,invert = <1>;		/* Output high */

		qcom,vin-sel = <0>;		/* VPH_PWR */

		qcom,src-sel = <0>;		/* Constant */

		qcom,out-strength = <1>;	/* High drive strength */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "okay";

	};



	gpio@d100 { /* GPIO 18 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <3>;		/* Function 2 */

		qcom,out-strength = <2>;	/* Medium */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "okay";

	};



	gpio@d200 { /* GPIO 19 */

		qcom,mode = <1>;		/* Digital output*/

		qcom,pull = <4>;		/* Pulldown 10uA */

		qcom,vin-sel = <2>;		/* VIN2 */

		qcom,src-sel = <0>;		/* GPIO */

		qcom,invert = <0>;		/* Invert */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "okay";

	};

};



&pmi8994_gpios {

arch/arm/boot/dts/qcom/msm8992-mtp.dtsi

+45 −0
Original line number Diff line number Diff line
@@ -72,6 +72,19 @@ 
	pinctrl-4 = <&mdss_hdmi_hpd_suspend &mdss_hdmi_ddc_suspend

						&mdss_hdmi_cec_suspend>;

};



/ {

	bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&pm8994_gpios 19 0>; /* BT_EN */

		qca,bt-vdd-pa-supply = <&bt_vreg>;

		qca,bt-vdd-io-supply = <&pm8994_s4>;

		qca,bt-vdd-xtal-supply = <&pm8994_l30>;

		qca,bt-vdd-io-voltage-level = <1800000 1800000>;

		qca,bt-vdd-xtal-voltage-level = <1800000 1800000>;

	};

};



&blsp1_uart2 {

	status= "ok";

	pinctrl-names = "default";
@@ -207,6 +220,38 @@ 
		qcom,master-en = <1>;

		status = "okay";

	};



	gpio@c800 { /* GPIO 9 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,invert = <1>;		/* Output high */

		qcom,vin-sel = <0>;		/* VPH_PWR */

		qcom,src-sel = <0>;		/* Constant */

		qcom,out-strength = <1>;	/* High drive strength */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "okay";

	};



	gpio@d100 { /* GPIO 18 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <3>;		/* Function 2 */

		qcom,out-strength = <2>;	/* Medium */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "okay";

	};



	gpio@d200 { /* GPIO 19 */

		qcom,mode = <1>;		/* Digital output*/

		qcom,pull = <4>;		/* Pulldown 10uA */

		qcom,vin-sel = <2>;		/* VIN2 */

		qcom,src-sel = <0>;		/* GPIO */

		qcom,invert = <0>;		/* Invert */

		qcom,master-en = <1>;		/* Enable GPIO */

		status = "okay";

	};

};



&pmi8994_gpios {

arch/arm/boot/dts/qcom/msm8992-regulator.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -766,4 +766,12 @@ 
		qcom,cpr-speed-bin-max-corners =

				<0xFFFFFFFF 0 1 5 8 15>;

	};



	bt_vreg: bt_vreg {

		compatible = "regulator-fixed";

		regulator-name = "bt_vreg";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm8994_gpios 9 0>;

	};

};