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

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

Merge 155f39f4 on remote branch 

Change-Id: Ib5a13f87849c94310e23c692c2282e20941656af
parents 966645c4 155f39f4

bindings/media/video/msm-vidc.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required properties: 
	- "qcom,sm6150-vidc" : Invokes driver specific data for SA6155.

	- "qcom,scuba-vidc" : Invokes driver specific data for SCUBA.

	- "qcom,monaco-vidc" : Invokes driver specific data for MONACO.

	- "qcom,qcm6490-vidc" : Invokes driver specific data for YUPIK-IOT.



Optional properties:

- vidc,firmware-name : Video Firmware ELF image name to be loaded by PIL

- reg : offset and length of the register set for the device.

bindings/net/qrtr-mhi-dev.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
QTI QRTR MHI Dev transport binding



- compatible:

	Usage: required

	Value type: <stringlist>

	Definition: must be "qcom,qrtr-mhi-dev"



- qcom,net-id:

	Usage: optional

	Value type: <u32>

	Definition: indicates what subnet this transport belongs to. Should be

		    passed into the qrtr core logic to determine if forwarding

		    is needed on this endpoint.



- qcom,low-latency:

	Usage: optional

	Value type: <bool>

	Definition: indicates whether this transport receiving thread needs to

		    be set to realtime priority for enhanced performance.



= EXAMPLE

The following example represents the qrtr mhi dev transport node on a device

configured as a pcie endpoint and needs to forward data from the host to a

modem co-processor.



	qcom,mhi_dev_qrtr {

		compatible = "qcom,qrtr-mhi-dev";

		qcom,net-id = <3>;

		qcom,low-latency;

	};

qcom/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -409,14 +409,19 @@ dtb-$(CONFIG_ARCH_SDXLEMUR) += sdxlemur-rumi.dtb \ 
	sdxlemur-mtp.dtb \

	sdxlemur-mtp-mbb.dtb \

	sdxlemur-mtp-cpe.dtb \

	sdxlemur-mtp-cpe-pine1x.dtb \

	sdxlemur-mtp-cpe-pine2x.dtb \

	sdxlemur-mtp-mbb-emmc.dtb \

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

	sdxlemur-mtp-mbb-ntn3-pcie.dtb \

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

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

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

	sdxlemur-mtp-mbb.dtb \

	sdxlemur-rcm-pcie-ep.dtb \

	sdxlemur-rcm-rc.dtb \

	sdxlemur-rcm-rc-pine1x.dtb \

	sdxlemur-rcm-rc-pine2x.dtb \

	sdxlemur-v2-cdp.dtb \

	sdxlemur-v2-mtp-mbb.dtb \

	sdxlemur-v2-mtp-cpe.dtb \

qcom/blair-qrd.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ 
		focaltech,irq-gpio = <&tlmm 22 0x2008>;

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

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

		focaltech,power-always-on;



		vcc_i2c-supply = <&L9A>;

		vdd-supply = <&touch_avdd>;

qcom/blair-usb.dtsi

+19 −3
Original line number Diff line number Diff line
@@ -40,7 +40,23 @@ 


		qcom,core-clk-rate = <133333333>;

		qcom,core-clk-rate-hs = <66666667>;



		interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";

		interconnects = <&system_noc MASTER_USB3_0 &bimc SLAVE_EBI>,

				<&system_noc MASTER_USB3_0 &config_noc SLAVE_IPA_CFG>,

				<&bimc MASTER_AMPSS_M0 &config_noc SLAVE_USB3>;



		qcom,interconnect-values-nom = /* NOMINAL Votes */

						<1000000 1550000>,

						<0 2400>,

						<0 40000>;

		qcom,interconnect-values-svs = /* SVS Votes */

						<240000 700000>,

						<0 2400>,

						<0 40000>;



		qcom,num-gsi-evt-buffs = <0x3>;

		qcom,pm-qos-latency = <61>;

		qcom,gsi-reg-offset =

			<0x0fc /* GSI_GENERAL_CFG */

			 0x110 /* GSI_DBL_ADDR_L */
@@ -89,9 +105,9 @@ 
		resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;

		reset-names = "phy_reset";

		qcom,param-override-seq =

			<0xe6 0x6c	/* override_x0 */

			 0x0b 0x70	/* override_x1 */

			 0x17 0x74>;	/* override x2 */

			<0x61 0x6c	/* override_x0 */

			 0x43 0x70	/* override_x1 */

			 0x2e 0x74>;	/* override x2 */

	};



	/* Primary USB port related QMP USB DP Combo PHY */