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

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

Merge a1bcd20b on remote branch 

Change-Id: I06a5f5639962a19376722af756910499a2a699e6
parents 82f5d459 a1bcd20b

bindings/arm/msm/sdx-ext-ipc.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
Modem chipset attached to Application processor



Modem chipset can be connected to an external apss processor. The control

channel between the two chipsets consists of gpios that can relay the

state of one subsytem to another. Modem can indicate different events

(bootup/crash etc.) to AP and can get the same information from AP.



Required Properties:

- compatible:	"qcom,sdx-ext-ipc".



Optional named gpio properties:

- qcom,status-out-gpio: gpio to indicate the boot status to remote processor.



- qcom,status-in-gpio: gpio for remote processor to indicate the boot status.



- qcom,status-out2-gpio: gpio to indicate to remote processor that it is in

		E911 call or doing firmware upgrade.



- qcom,default-policy-nop: Set default policy from PANIC to NOP.



- qcom,wakeup-gpio-out: gpio to wakeup remote AP or modem.



- qcom,wakeup-gpio-in: input gpio to receive wakeup signal from remote AP or

		modem.



Example:

	sdx_ext_ipc: qcom,sdx_ext_ipc {

		compatible = "qcom,sdx-ext-ipc";

		qcom,status-in-gpio = <&tlmm 64 0x00>;

		qcom,status-out-gpio = <&tlmm 63 0x00>;

		qcom,status-out2-gpio = <&tlmm 66 0x00>;

		qcom,wakeup-gpio-in = <&tlmm 67 0x00>;

		qcom,wakeup-gpio-out = <&tlmm 68 0x00>;

	};

bindings/iommu/arm,smmu.txt

+0 −7
Original line number Diff line number Diff line
@@ -182,13 +182,6 @@ conditions. 
		  that interconnect votes will be maintained irrespective of

		  the CPUSS' state (awake or asleep).



- qcom,power-always-on:

		  Boolean property which indicates that votes for power

		  resources (i.e. regulators, clocks, buses) should

		  always be maintained. This is required when the latency

		  for the SMMU's operation is greatly increased by adding and

		  removing votes for power resources.



** Deprecated properties:



- mmu-masters (deprecated in favour of the generic "iommus" binding) :

bindings/thermal/qcom-bcl-pmic5.txt

+16 −0
Original line number Diff line number Diff line
@@ -41,6 +41,20 @@ Optional Parameters: 
			current monitoring(CCM) hardware for battery current

			monitor.



- nvmem-cells:

	Value type: <phandle>

	Definition: phandle pointing to a nvmem-cells node representing the

			sdam registers that has information of ibat scaling range

			factor.When defined, the bcl driver will use it to

			scale ibat current greater than default supported range.



- nvmem-cell-names:

	Value type: <string>

	Definition: Specifies the given nvmem cell name as defined in

			sdam node.

			Documentation/devicetree/bindings/nvmem/nvmem.txt and also

			example below.



Example:

		bcl@4200 {

			compatible = "qcom,bcl-v5";
@@ -51,4 +65,6 @@ Example: 
						"bcl-lvl1";

			qcom,pmic7-threshold;

			qcom,ibat-ccm-hw-support;

			nvmem-cells = <&adc_scaling>;

			nvmem-cell-names = "adc_scaling";

		};

qcom/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -204,14 +204,14 @@ dtbo-$(CONFIG_ARCH_YUPIK) += \ 
	yupik-idp-overlay.dtbo \

	yupik-atp-overlay.dtbo \

	yupik-qrd-overlay.dtbo \

	yupik-idps-digital-mics-overlay.dtbo \

	yupik-idps-amoled-overlay.dtbo \

	yupik-idp-pm7250b-overlay.dtbo \

	yupik-idp-hsp-overlay.dtbo \

	yupikp-idp-overlay.dtbo \

	yupikp-atp-overlay.dtbo \

	yupikp-qrd-overlay.dtbo \

	yupikp-idps-digital-mics-overlay.dtbo \

	yupikp-idps-amoled-overlay.dtbo \

	yupikp-idp-hsp-overlay.dtbo \

	yupik-iot-idp-overlay.dtbo \

	yupik-iot-qrd-overlay.dtbo \

	yupik-iot-hsp-overlay.dtbo \
@@ -226,14 +226,14 @@ yupik-rumi-overlay.dtbo-base := yupik.dtb 
yupik-idp-overlay.dtbo-base := yupik.dtb

yupik-atp-overlay.dtbo-base := yupik.dtb

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

yupik-idps-digital-mics-overlay.dtbo-base := yupik.dtb

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

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

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

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

yupikp-atp-overlay.dtbo-base := yupikp.dtb

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

yupikp-idps-digital-mics-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-qrd-overlay.dtbo-base := yupik-iot.dtb

yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb
@@ -247,14 +247,14 @@ dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \ 
	yupik-idp.dtb \

	yupik-atp.dtb \

	yupik-qrd.dtb \

	yupik-idps-digital-mics.dtb \

	yupik-idps-amoled.dtb \

	yupik-idp-pm7250b.dtb \

	yupik-idp-hsp.dtb \

	yupikp-idp.dtb \

	yupikp-atp.dtb \

	yupikp-qrd.dtb \

	yupikp-idps-digital-mics.dtb \

	yupikp-idps-amoled.dtb \

	yupikp-idp-hsp.dtb \

	yupik-iot-idp.dtb \

	yupik-iot-qrd.dtb \

	yupik-iot-hsp.dtb \

qcom/blair-mtp-usbc-overlay.dts

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/plugin/;



#include "blair-mtp-usbc.dtsi"

#include "holi-mtp-pm7250b.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Blair MTP USBC audio";
@@ -26,6 +27,10 @@ 
	status = "disabled";

};



&pm7250b_charger {

	dpdm-supply = <&usb2_phy0>;

};



&wcd938x_tx_slave {

	status = "ok";

};