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

Commit df2fc7ac 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: Add BT node, GPIO regulator"

parents b823f10e c4f95220

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

+41 −0
Original line number Diff line number Diff line
@@ -13,6 +13,18 @@ 
#include "msm8994-pinctrl.dtsi"

#include "msm8994-camera-sensor-cdp.dtsi"



/ {

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

	};

};



&sdhc_1 {

	vdd-supply = <&pm8994_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;
@@ -343,6 +355,16 @@ 
		qcom,src-sel = <0>;

	};



	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 */

	};



	gpio@ce00 { /* GPIO 15 */

		qcom,mode = <1>;

		qcom,output-type = <0>;
@@ -352,6 +374,25 @@ 
		qcom,src-sel = <2>;

		qcom,master-en = <1>;

	};



	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 */

	};



	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 */

	};

};



&pm8994_mpps {

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

+41 −0
Original line number Diff line number Diff line
@@ -13,6 +13,18 @@ 
#include "msm8994-pinctrl.dtsi"

#include "msm8994-camera-sensor-cdp.dtsi"



/ {

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

	};

};



&sdhc_1 {

	vdd-supply = <&pm8994_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;
@@ -343,6 +355,16 @@ 
		qcom,src-sel = <0>;

	};



	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 */

	};



	gpio@ce00 { /* GPIO 15 */

		qcom,mode = <1>;

		qcom,output-type = <0>;
@@ -352,6 +374,25 @@ 
		qcom,src-sel = <2>;

		qcom,master-en = <1>;

	};



	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 */

	};



	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 */

	};

};



&pm8994_mpps {

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

+8 −0
Original line number Diff line number Diff line
@@ -588,4 +588,12 @@ 
		qcom,cpr-init-voltage-ref = <900000 1000000 1225000>;

		qcom,cpr-init-voltage-step = <10000>;

	};



	bt_vreg: bt_vreg {

		compatible = "regulator-fixed";

		regulator-name = "bt_vreg";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm8994_gpios 9 0>;

	};

};