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

Commit d5152c3d 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 Blackghost pil node for msm8909w BG WTP"

parents 9054dfb1 92bb99a8

arch/arm64/boot/dts/qcom/8909w-pm660.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ 
			pins = "gpio12";

			function = "normal";

			output-enable;

			qcom,drive-strength = "medium";

			qcom,drive-strength = <2>;

		};

	};
@@ -459,7 +459,7 @@ 
			pins = "gpio5";

			function = "func1";

			output-enable;

			qcom,drive-strength = "medium";

			qcom,drive-strength = <2>;

			bias-disable;

		};

	};

arch/arm64/boot/dts/qcom/msm8909-ion.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,12 @@ 
			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@19 { /* QSEECOM TA HEAP */

			reg = <19>;

			memory-region = <&qseecom_ta_mem>;

			qcom,ion-heap-type = "DMA";

		};



		adsp_heap: qcom,ion-heap@22 { /* MODEM HEAP */

			reg = <22>;

			memory-region = <&adsp_mem>;

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

+8 −0
Original line number Diff line number Diff line
@@ -194,6 +194,14 @@ 
			size = <0 0x0800000>;

		};



		qseecom_ta_mem: qseecom_ta_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0 0x00000000 0 0xffffffff>;

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x400000>;

		};



		audio_mem: audio_region@0 {

			compatible = "shared-dma-pool";

			reusable;

arch/arm64/boot/dts/qcom/msm8909w-bg-wtp-v2.dts

+13 −0
Original line number Diff line number Diff line
@@ -69,6 +69,17 @@ 
		/delete-node/ it7260@46;

	};



	qcom,blackghost {

		compatible = "qcom,pil-blackghost";

		qcom,firmware-name = "bg-wear";

		/* GPIO inputs from blackghost */

		qcom,bg2ap-status-gpio = <&msm_gpio 97 0>;

		qcom,bg2ap-errfatal-gpio = <&msm_gpio 95 0>;

		/* GPIO output to blackghost */

		qcom,ap2bg-status-gpio = <&msm_gpio 17 0>;

		qcom,ap2bg-errfatal-gpio = <&msm_gpio 23 0>;

	};



	qcom,msm-ssc-sensors {

		compatible = "qcom,msm-ssc-sensors";

	};
@@ -155,6 +166,8 @@ 
	qcom,bg-daemon {

		compatible = "qcom,bg-daemon";

		qcom,bg-reset-gpio = <&pm660_gpios 5 0>;

		ssr-reg1-supply = <&pm660_l3>;

		ssr-reg2-supply = <&pm660_l9>;

	};



	qcom,bcl {