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

Commit 8a70628d authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 3b8d07b1 on remote branch 

Change-Id: I652d0b0814f030bfdaf9ae683cf0e9bd9056fd56
parents ad6538c9 3b8d07b1

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

qcom/Makefile

+12 −0
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

qcom/holi-pmic-overlay-pm6125.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -494,3 +494,6 @@ 
	};

};



&pm6125_pon {

	qcom,log-kpd-event;

};