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

Commit 0688eeee 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: apq8084: qca1530: qca1530 bindings for liquid and cdp"

parents 8f33925c dbdecbeb

arch/arm/boot/dts/qti/apq8084-cdp.dtsi

+8 −1
Original line number Diff line number Diff line
@@ -82,6 +82,13 @@ 
		enable-active-high;

		gpio = <&msmgpio 39 0>;

	};



	gnss_qca1530: qca,qca1530 {

		compatible = "qca,qca1530";

		qca,reset-gpio = <&msmgpio 133 0>;	/* Reset line */

		qca,reset-supply = <&pma8084_l9>;	/* Reset power regulator */

		qca,pwr-supply = <&pma8084_l26>;	/* Power regulator */

	};

};



#include "dsi-panel-jdi-1080p-video.dtsi"
@@ -363,7 +370,7 @@ 
		qcom,output-type = <0>;		/* CMOS logic */

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

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

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

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

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

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

	};

arch/arm/boot/dts/qti/apq8084-liquid.dtsi

+7 −1
Original line number Diff line number Diff line
@@ -119,6 +119,12 @@ 
			debounce-interval = <15>;

		};

	};



	gnss_qca1530: qca,qca1530@0 {

		compatible = "qca,qca1530";

		qca,reset-gpio = <&msmgpio 128 0>;	/* Reset line */

		qca,pwr-supply = <&qca1530_vreg>;	/* Power regulator */

	};

};



#include "dsi-panel-jdi-dualmipi0-video.dtsi"
@@ -402,7 +408,7 @@ 
		qcom,output-type = <0>;		/* CMOS logic */

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

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

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

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

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

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

	};