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

Commit 273b5eea authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 976df727 on remote branch 

Change-Id: Idd5d9d1ba0bd327543c34c353091a1e6cb84848a
parents c53b4f81 976df727

qcom/bengal-idp.dtsi

+48 −0
Original line number Diff line number Diff line
@@ -332,6 +332,35 @@ 
	qcom,dsi-default-panel = <&dsi_td4330_truly_v2_video>;

};



&tlmm {

	touch_vdd_default: touch_vdd_default {

		mux {

			pins = "gpio84";

			function = "gpio";

		};



		config {

			pins = "gpio84";

			drive-strength = <8>;

			bias-disable = <0>;

			output-high;

		};

	};

};



&soc {

	touch_vdd: touch_vdd {

			compatible = "regulator-fixed";

			regulator-name = "touch_vdd";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&tlmm 84 GPIO_ACTIVE_HIGH>;

			enable-active-high;

			pinctrl-names = "default";

			pinctrl-0 = <&touch_vdd_default>;

	};

};



&qupv3_se2_i2c {

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";
@@ -378,4 +407,23 @@ 


		panel = <&dsi_nt36525_truly_video>;

	};



	focaltech@38 {

		compatible = "focaltech,fts_ts";

		reg = <0x38>;

		interrupt-parent = <&tlmm>;

		interrupts = <80 0x2008>;

		focaltech,reset-gpio = <&tlmm 71 0x00>;

		focaltech,irq-gpio = <&tlmm 80 0x2008>;

		focaltech,max-touch-number = <5>;

		focaltech,display-coords = <0 0 1080 2340>;



		vdd-supply = <&touch_vdd>;



		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",

			"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

	};

};

qcom/bengal.dtsi

+29 −29
Original line number Diff line number Diff line
@@ -288,82 +288,82 @@ 
		#size-cells = <2>;

		ranges;



		hyp_mem: hyp_region@85700000 {

		hyp_mem: hyp_region@45700000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x85700000 0x0 0x600000>;

			reg = <0x0 0x45700000 0x0 0x600000>;

		};



		xbl_aop_mem: xbl_aop_region@85e00000 {

		xbl_aop_mem: xbl_aop_region@45e00000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x85e00000 0x0 0x140000>;

			reg = <0x0 0x45e00000 0x0 0x140000>;

		};



		sec_apps_mem: sec_apps_region@85fff000 {

		sec_apps_mem: sec_apps_region@45fff000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x85fff000 0x0 0x1000>;

			reg = <0x0 0x45fff000 0x0 0x1000>;

		};



		smem_mem: smem_region@86000000 {

		smem_mem: smem_region@46000000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x86000000 0x0 0x200000>;

			reg = <0x0 0x46000000 0x0 0x200000>;

		};



		removed_mem: removed_region@a0000000 {

		removed_mem: removed_region@60000000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0xa0000000 0x0 0x3900000>;

			reg = <0x0 0x60000000 0x0 0x3900000>;

		};



		pil_modem_mem: modem_region@8ab00000 {

		pil_modem_mem: modem_region@4ab00000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8ab00000 0x0 0x6900000>;

			reg = <0x0 0x4ab00000 0x0 0x6900000>;

		};



		pil_video_mem: pil_video_region@91400000 {

		pil_video_mem: pil_video_region@51400000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x91400000 0x0 0x500000>;

			reg = <0x0 0x51400000 0x0 0x500000>;

		};



		wlan_msa_mem: wlan_msa_region@91900000 {

		wlan_msa_mem: wlan_msa_region@51900000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x91900000 0x0 0x200000>;

			reg = <0x0 0x51900000 0x0 0x100000>;

		};



		pil_cdsp_mem: cdsp_regions@91b00000 {

		pil_cdsp_mem: cdsp_regions@51a00000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x91b00000 0x0 0x1e00000>;

			reg = <0x0 0x51a00000 0x0 0x1e00000>;

		};



		pil_adsp_mem: pil_adsp_region@93900000 {

		pil_adsp_mem: pil_adsp_region@53800000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x93900000 0x0 0x1e00000>;

			reg = <0x0 0x53800000 0x0 0x1e00000>;

		};



		pil_ipa_fw_mem: ipa_fw_region@95700000 {

		pil_ipa_fw_mem: ipa_fw_region@55600000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x95700000 0x0 0x10000>;

			reg = <0x0 0x55600000 0x0 0x10000>;

		};



		pil_ipa_gsi_mem: ipa_gsi_region@95710000 {

		pil_ipa_gsi_mem: ipa_gsi_region@55610000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x95710000 0x0 0x5000>;

			reg = <0x0 0x55610000 0x0 0x5000>;

		};



		pil_gpu_mem: gpu_region@95715000 {

		pil_gpu_mem: gpu_region@55615000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x95715000 0x0 0x2000>;

			reg = <0x0 0x55615000 0x0 0x2000>;

		};



		user_contig_mem: user_contig_region {
@@ -390,10 +390,10 @@ 
			size = <0x0 0x1000000>;

		};



		cdsp_sec_mem: cdsp_sec_regions@86200000 {

		cdsp_sec_mem: cdsp_sec_regions@46200000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x86200000 0x0 0x1e00000>;

			reg = <0x0 0x46200000 0x0 0x1e00000>;

		};



		secure_display_memory: secure_display_region {
@@ -1419,7 +1419,7 @@ 
		reset-names = "core_reset";



		/* DLL HSR settings. Refer go/hsr - <Target> DLL settings */

		qcom,dll-hsr-list = <0x000f642c 0x0 0x0 0x00010800 0x80040868>;

		qcom,dll-hsr-list = <0x000f642c 0x0 0x0 0x00010800 0x80040860>;



		qcom,nonremovable;

		status = "disabled";

qcom/kona-cdp.dtsi

+15 −5
Original line number Diff line number Diff line
@@ -21,12 +21,22 @@ 


&dai_mi2s2 {

	qcom,msm-mi2s-tx-lines = <1>;

	pinctrl-names = "default", "sleep";

};



&q6core {

	cdc_tert_mi2s_gpios: msm_cdc_pinctrl_tert {

		compatible = "qcom,msm-cdc-pinctrl";

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active

				&tert_mi2s_sd0_active>;

		pinctrl-1 = <&tert_mi2s_sck_sleep &tert_mi2s_ws_sleep

				&tert_mi2s_sd0_sleep>;

	};

};



&kona_snd {

	qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;

};



&qupv3_se1_i2c {

	status = "ok";

qcom/kona-mtp.dtsi

+15 −5
Original line number Diff line number Diff line
@@ -21,12 +21,22 @@ 


&dai_mi2s2 {

	qcom,msm-mi2s-tx-lines = <1>;

	pinctrl-names = "default", "sleep";

};



&q6core {

	cdc_tert_mi2s_gpios: msm_cdc_pinctrl_tert {

		compatible = "qcom,msm-cdc-pinctrl";

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active

				&tert_mi2s_sd0_active>;

		pinctrl-1 = <&tert_mi2s_sck_sleep &tert_mi2s_ws_sleep

				&tert_mi2s_sd0_sleep>;

	};

};



&kona_snd {

	qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;

};



&qupv3_se1_i2c {

	status = "ok";

qcom/kona-qrd.dtsi

+13 −5
Original line number Diff line number Diff line
@@ -27,12 +27,18 @@ 


&dai_mi2s2 {

	qcom,msm-mi2s-tx-lines = <1>;

	pinctrl-names = "default", "sleep";

};



&q6core {

	cdc_tert_mi2s_gpios: msm_cdc_pinctrl_tert {

		compatible = "qcom,msm-cdc-pinctrl";

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active

				&tert_mi2s_sd0_active>;

		pinctrl-1 = <&tert_mi2s_sck_sleep &tert_mi2s_ws_sleep

				&tert_mi2s_sd0_sleep>;

	};

};



&kona_snd {

	qcom,model = "kona-qrd-snd-card";
@@ -110,6 +116,8 @@ 
	qcom,msm-mbhc-usbc-audio-supported = <1>;

	qcom,msm-mbhc-hphl-swh = <0>;

	qcom,msm-mbhc-gnd-swh = <0>;



	qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;

};



&qupv3_se1_i2c {