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

Commit 300a5a37 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d0f3aa17 on remote branch 

Change-Id: I6709b2612ebc90e5a1d56e096b976a172ea3ce79
parents 74b7b2f9 d0f3aa17

bindings/cnss/cnss-wlan.txt

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ Optional properties: 
		regulator used in internal power amplifier for QCA6490

  - cnss-enable-self-recovery: Boolean property to enable self recovery when

                               recovery is trigeered with reason link down.

  - default_gen_speed: U32 property to specify pcie default gen speed.

  - qcom,bt-en-gpio: QCA6490 requires synchronization for BT and WLAN GPIO

		enable to resolve PMU power up issues. Provide BT GPIO using

		this config param.

bindings/gpu/adreno.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
			Must include "qcom,adreno-gpu-a619-holi" for Holi target.

			Must include "qcom,adreno-gpu-a642" for Shima target.

			Must include "qcom,adreno-gpu-a642l" for Yupik target.

			Must include "qcom,adreno-gpu-a643" for Yupik a643 target.

- reg:			Specifies the list of register regions for the device.

- reg-names:		Resource names used for the register regions specified

			in reg.

bindings/input/qpnp-power-on.txt

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ Optional properties: 
- qcom,use-legacy-hard-reset-offset       Boolean property to support legacy

				hard-reset offset of the PON_RB_SPARE register for

				some (PON gen2) platforms.

- qcom,log-kpd-event:		Boolean property to enable logging of KPDPWR status

				during driver INIT and runtime when key is pressed.



Optional Sub-nodes:

- qcom,pon_1 ... qcom,pon_n:	These PON child nodes correspond to features

bindings/sound/qcom-audio-dev.txt

+82 −31
Original line number Diff line number Diff line
@@ -1444,8 +1444,10 @@ Example: 
				"msm-pcm-routing", "msm-cpe-lsm",

				"msm-compr-dsp", "msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_pri_auxpcm>, <&dai_sec_auxpcm>,

				<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,

				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
@@ -1468,6 +1470,8 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-auxpcm.3", "msm-dai-q6-auxpcm.4",

				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
@@ -1578,9 +1582,12 @@ Example: 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1608,7 +1615,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224",
@@ -1714,9 +1724,12 @@ Example: 
				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",

				"msm-pcm-dtmf";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1748,7 +1761,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
@@ -1857,9 +1873,12 @@ Example: 
				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

		asoc-cpu = <&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1885,7 +1904,10 @@ Example: 
				<&tx_cdc_dma_6_tx>, <&tx_cdc_dma_7_tx>;

		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224",
@@ -2147,9 +2169,12 @@ Example: 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_rx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2176,7 +2201,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224",
@@ -2300,9 +2328,12 @@ Example: 
				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",

				"msm-pcm-dtmf";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_rx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2334,7 +2365,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
@@ -2444,9 +2478,13 @@ Example: 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_dp>, <&dai_dp1>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_mi2s5_rx>, <&dai_mi2s5_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&dai_sen_auxpcm>,
@@ -2479,6 +2517,9 @@ Example: 
				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-mi2s.10", "msm-dai-q6-mi2s.11",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
@@ -2595,8 +2636,10 @@ Example: 
				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

		asoc-cpu = <&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>,
@@ -2623,6 +2666,8 @@ Example: 
				<&rx_cdc_dma_7_rx>,<&afe_loopback_tx>;

		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4",
@@ -2802,9 +2847,12 @@ Example: 
				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",

				"msm-pcm-dtmf";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2836,7 +2884,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

qcom/Makefile

+22 −1
Original line number Diff line number Diff line
@@ -213,12 +213,16 @@ dtbo-$(CONFIG_ARCH_YUPIK) += \ 
	yupikp-idps-amoled-overlay.dtbo \

	yupikp-idp-hsp-overlay.dtbo \

	yupik-iot-idp-overlay.dtbo \

	yupik-iot-idp-pm7250b-overlay.dtbo \

	yupik-iot-qrd-overlay.dtbo \

	yupik-iot-hsp-overlay.dtbo \

	yupik-iot-hsp-pm7250b-overlay.dtbo \

	yupik-iot-idps-amoled-overlay.dtbo \

	yupikp-iot-idp-overlay.dtbo \

	yupikp-iot-idp-pm7250b-overlay.dtbo \

	yupikp-iot-qrd-overlay.dtbo \

	yupikp-iot-hsp-overlay.dtbo \

	yupikp-iot-hsp-pm7250b-overlay.dtbo \

	yupikp-iot-idps-amoled-overlay.dtbo
@@ -235,12 +239,16 @@ yupikp-qrd-overlay.dtbo-base := yupikp.dtb 
yupikp-idps-amoled-overlay.dtbo-base := yupikp.dtb

yupikp-idp-hsp-overlay.dtbo-base := yupikp-hsp.dtb

yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb

yupik-iot-idp-pm7250b-overlay.dtbo-base := yupik-iot.dtb

yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb

yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb

yupik-iot-hsp-pm7250b-overlay.dtbo-base := yupik-iot.dtb

yupik-iot-idps-amoled-overlay.dtbo-base := yupik-iot.dtb

yupikp-iot-idp-overlay.dtbo-base := yupikp-iot.dtb

yupikp-iot-idp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb

yupikp-iot-qrd-overlay.dtbo-base := yupikp-iot.dtb

yupikp-iot-hsp-overlay.dtbo-base := yupikp-iot.dtb

yupikp-iot-hsp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb

yupikp-iot-idps-amoled-overlay.dtbo-base := yupikp-iot.dtb

else

dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \
@@ -256,12 +264,16 @@ dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \ 
	yupikp-idps-amoled.dtb \

	yupikp-idp-hsp.dtb \

	yupik-iot-idp.dtb \

	yupik-iot-idp-pm7250b.dtb \

	yupik-iot-qrd.dtb \

	yupik-iot-hsp.dtb \

	yupik-iot-idps-amoled.dtb \

	yupikp-iot-idp.dtb \

	yupikp-iot-idp-pm7250b.dtb \

	yupikp-iot-qrd.dtb \

	yupikp-iot-hsp.dtb \

	yupik-iot-hsp-pm7250b.dtb \

	yupikp-iot-hsp-pm7250b.dtb \

	yupikp-iot-idps-amoled.dtb

endif
@@ -433,7 +445,16 @@ dtb-$(CONFIG_ARCH_SDXLEMUR) += sdxlemur-rumi.dtb \ 
	sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dtb \

	sdxlemur-v2-mtp-mbb-pcie-rc-ep.dtb \

	sdxlemur-v2-rcm-pcie-ep.dtb \

	sdxlemur-v2-rcm-rc.dtb

	sdxlemur-v2-rcm-rc.dtb \

	sdxlemur-v2-atp.dtb \

	sdxlemur-v2-mtp-cpe-pine1x.dtb \

	sdxlemur-v2-mtp-cpe-pine2x.dtb \

	sdxlemur-v2-mtp-mbb-emmc-512mb.dtb \

	sdxlemur-v2-mtp-mbb-m2-ep-usb.dtb \

	sdxlemur-v2-mtp-mbb-m2-ep.dtb \

	sdxlemur-v2-rcm-rc-pine1x.dtb \

	sdxlemur-v2-rcm-rc-pine2x.dtb







ifeq ($(CONFIG_ARCH_SHIMA), y)