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

Commit b81b05a4 authored by shaohanlin's avatar shaohanlin
Browse files

Merge branch vanilla into gms

parents 611148b2 7348685e

Documentation/devicetree/bindings/media/video/msm-csi-phy.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties: 
    - "qcom,csiphy-v3.1.1"

    - "qcom,csiphy-v3.2"

    - "qcom,csiphy-v3.4.2"

    - "qcom,csiphy-v3.4.2.1"

    - "qcom,csiphy-v3.5"

    - "qcom,csiphy-v5.0"

    - "qcom,csiphy-v5.01"

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ Required properties: 
 - compatible : "qcom,msm-pcm-voice"

 - qcom,destroy-cvd : Flag indicating whether to destroy cvd at

                      the end of call for low memory targets

 - qcom,vote-bms: Flag indicating whether to vote for BMS during

		  voice call or not



* msm-voice-host-pcm

arch/arm/configs/msm8937-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_HDCP_QSEECOM=y

CONFIG_QSEECOM=y

CONFIG_UID_SYS_STATS=y

CONFIG_FPR_FPC=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y
@@ -489,6 +490,7 @@ CONFIG_USB_CI13XXX_MSM=y 
CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_QCRNDIS=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_RMNET_BAM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

arch/arm/configs/msm8937_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_HDCP_QSEECOM=y

CONFIG_QSEECOM=y

CONFIG_UID_SYS_STATS=y

CONFIG_FPR_FPC=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y
@@ -498,6 +499,7 @@ CONFIG_USB_CI13XXX_MSM=y 
CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_QCRNDIS=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_RMNET_BAM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

arch/arm64/boot/dts/qcom/msm-arm-smmu-sdm845.dtsi

+13 −5
Original line number Diff line number Diff line
@@ -346,11 +346,19 @@ 
};



&apps_smmu {

	qcom,actlr =

		/* HF and SF TBUs: +3 deep PF */

			<0x0800 0x7ff 0x103>,

			<0x1000 0x3ff 0x103>;



	qcom,actlr =	<0x0880 0x8 0x103>,

			<0x0881 0x8 0x103>,

			<0x0c80 0x8 0x103>,

			<0x0c81 0x8 0x103>,

			<0x1090 0x0 0x103>,

			<0x1091 0x0 0x103>,

			<0x10a0 0x8 0x103>,

			<0x10b0 0x0 0x103>,

			<0x10a1 0x8 0x103>,

			<0x10a3 0x8 0x103>,

			<0x10a4 0x8 0x103>,

			<0x10b4 0x0 0x103>,

			<0x10a5 0x8 0x103>;

	qcom,mmu500-errata-1 =	<0x800 0x3ff>,

				<0xc00 0x3ff>;

};