Merge tag 'LA.UM.8.1.r1-14900-sm8150.0' into neutrino-msm-hotdogb-4.14

"LA.UM.8.1.r1-14900-sm8150.0" * tag 'LA.UM.8.1.r1-14900-sm8150.0': ARM: dts: msm: Increasing shared mem region size for sm6150 and atoll ARM: dts: msm: Disable hypervisor call for atoll diag: Add protection while accessing diag client map media: rc: Enable rxfifo in suspend mode msm: mhi_dev: Do not flush events to host if channel is stopped ARM: dts: msm: Disable blsp1_uart2b_hs for le cpe product msm: ipa: Fix using generic name for offload connect/disconnect mhi: core: add support to pause or resume data transfer mhi: core: Prevent suspend until channel operation is complete mhi: core: enable doorbell method for time synchronization mhi: core: use internal sequence numbers for timesync doorbells ARM: dts: msm: Update msmnile-Marmot to memory map V1 ARM: dts: msm: remove extra spaces for marmot device tree defconfig: Enable UAC1 config for qcs405/403 net: introduce the MACSEC netdev feature net: macsec: move some definitions in a dedicated header net: macsec: introduce the macsec_context structure net: introduce MACsec ops and add a reference in net_device net: phy: add MACsec ops in phy_device net: macsec: hardware offloading infrastructure macsec: update operstate when lower device changes (#7) net: macsec: PN wrap callback (#10) net: macsec: add mac offload msm: ipa: eth: Register upper interfaces with IPA net: aquantia: Send MACSEC events to IPA offload sub-system defconfig: Enable MACSec driver for sdxprairie ARM: dts: msm: Add support for QCS404 RCM platform clk: qcom: mdss: Add support for 10nm C-PHY shadow clock ARM64: dts: qcs405: Modify ext mclk freq tables qseecom: Proper handling of unmapping dmabuf mink: fix incorrect server release ARM: dts: msm: Enable vopcie for sm8150-sdxmarmot ARM: dts: msm: move hw or dedicated event ring properties mhi: core: block low power modes only in mission mode mhi: core: remove stray spinlock unlock call mhi: core: move non-essential errors to log messages diag: Prevent resource leakage of task structure msm: mdss: edid: restrain support for interlace video modes mhi: core: remove duplicate timesync sysfs functions mhi: core: add missing break in fast resume path mhi: core: synchronize fast resume and state change event thread HID: hiddev: do cleanup in failure of opening a device USB: core: Fix races in character device registration and deregistraion clk: qcom: gdsc: Support for min operational vote on GDSC parent mhi: core: add asynchronous time request support in sysfs mhi: core: fix bandwidth scaling initialization failure mhi: core: serialize execution environment and power off changes ARM: dts: msm: Add minimum CX vote for GPU CX GDSC on SM8150 msm: ipa: Add support to IPA FW load prior to kernel start msmL ipa3: Fix to avoid NULL pointer access after freeing it mtd: msm_qpic_nand: Configure address cyles as per device spec cnss2: Set WLAON_QFPROM_PWR_CTRL_REG during power on and off msm: ipa4: mhi qmap flow control pipe definitions for LE mhi: controller: qcom: Store serial number and oem pkhash info mhi: cntrl: qcom: use RC driver APIs to toggle low power modes arm64: dma_mapping: dma-mapping: Fix leak of dma_iommu_mapping power: smb5-lib: Fix incorrect CC-orientation notification to USB power: smb5-lib: Fix Type-C compliance failure PWM: Add support for PWM driver ARM: dts: msm: Add support for PWM device defconfig: pwm: Enable pwm driver ARM: dts: msm: Add and enable wlaon-set-pwr-ctrl for sdxprairie cnss2: Retry if PCI link traning fails during power up msm: ipa4: Enable QDSS IPA offload for LE msm: ipa: Fix reading the VLAN parameters msm: mhi_dev: Update notification on channel state msm: mhi_dev: Add QDSS MHI hardware channel msm: mhi_dev: Add QMAP flow control hardware channel drm: msm: dsi-staging: Add support for C-PHY dynamic clock switch drm: msm: dsi-staging: Add support to skip phy timing update msm:ipa: enable ipa mhi prime ARM: dts: msm: Enable soundcard registration for sm8150-sdxmarmot MTP defconfig: arm64: msm: Enable pwm driver for QCS405 perf ARM: dts: msm: Modify PWM device node name for QCS405 msm: ipa: eth: Log MACSEC events from network driver msm: ipa: eth: Register panic notifier for individual devices msm: ipa: eth: Explicitly fetch initial link status msm: ipa: eth: Schedule offload refresh after successful pairing ARM: dts: msm: fix hw event rings for sdx50m overlay msm: ipa: Add mechanism to check if FW is already loaded via XBL ARM: dts: msm: enable xbl boot loading for IPA FW on sdxprairie clk: qcom: mdss: DSI clk changes for sdm660 diag: Do not open mhi channels on usb connect msm: kgsl: Fix DMA API warnings drm/msm/sde: return error for atomic check failures ARM: dts: msm: add CPU dai for additional proxy ports ARM: dts: msm: Enable dynamic clock switch for nt36672c panel msm: ipa3: Following HPG sequence for HOLB enabling f_uac1: Add support for volume/mute control settings dcc_v2: Disable the links when fail to config any link ARM: dts: msm: Add audio hw vote clock node in lpi f_uac1: Remove unwanted descriptors for volume/mute support net: phy: Add skip sw reset capability mtd: nand: Add support for JSFCCE5QHAFGC-405 msm: ipa: Fix considering prefetch buf size when mapping drm/msm/dsi-staging: Add support for clk switch with constant FPS drm/msm/dsi-staging: Fix porch calculation issue for constant fps ARM: dts: msm: Enable constant fps feature ARM: dts: msm: Update copyright year of atoll-sde-display.dtsi ARM: dts: msm: EMAC phy addr msm: ipa3: fixed memory leak msm: npu: Increase IOMMU mapping size to 4GB disp: msm: Add support for seamless panel operating mode switch disp: msm: dsi: enable multi mode support for video mode panel 4480: Fix headset not detected during system suspend qrtr: mhi-dev: Wait for RX channel to be enumerated msm: adsprpc: Put upper limit on IOMMU mapping size usb: dwc3: Remove WQ_MEM_RECLAIM flag while allocating sm_usb_wq net: qrtr: Handle error from skb_put_padto net: qrtr: Attempt to linearize skb for forwarding crypto: msm: restrict value of num_fds to QCEDEV_MAX_BUFFERS msm: mhi_dev: Update detecting BME during link enumeration ARM: dts: msm: Add GPU 800Mhz fmax support for sdmmagpie GPU disp: msm: sde: avoid input handler registration in video mode disp: msm: sde: Get connector roi state even when PU is disabled disp: msm: dsi: Enable ESD check after POMS done disp: msm: fix vsync wait for poms and dms disp: msm: dsi: add panel mode restriction for DFPS and RFI disp: msm: dsi: refine the logic for mode filling and calculation defconfig: sdxprairie: enable CONFIG_NET_SCH_HTB defconfig: sdxprairie: enable CONFIG_NET_SCH_TBF smcinvoke : Add logging in smcinvoke driver ARM: dts: msm: enable POMS on TD4330 panel for trinket ARM: dts: msm: add support for SMP2P shutdown ack from modem msm: ep_pcie: Add Host reset address offset support ARM: dts: msm: Add MHI SoC reset offset ARM: dts: msm: Add NPU_DSP stream IDs for npu atoll msm: npu: Increase timeout for NPU bringup to 60 seconds drm: msm: dsi-staging: CPhy constant fps porch calculation sched: Improve the scheduler diag: Wait with timeout while apps data buffers are flushed ARM: dts: msm: enable POMS on TD4330 cmd panel for trinket cnss2: Retry if PCI link training fails msm: npu: Disable NPU after SSR handling msm: ipa3: Update holb config on WLAN & USB CONS ep msm: mhi_dev: Disable IPA DMA during MHI cleanup msm: mhi_dev: Add an option to not timeout waiting for M0 msm: mhi_dev: Release wakelock after sending completion msm: mhi_dev: Fix clearing control interrupt mhi: core: Make sure reg_write_q stores visible to other cores msm: ipa: interface to provide pdn configuration msm: mhi_dev: Avoid re-alloc of netdev interface msm: ipa4: update proc_ctx generic command params msm: npu: Send IPCC irq directly while apps crashes ARM: dts: msm: Add support for QCS405/QCS407 32bit support ARCH: ARM: Add qcs407,qcs405 to board files atlantic forwarding driver v1.1.5 atlantic forwarding driver v1.1.6 macsec: not handle MKA packets in case of offload net: macsec: count RX bytes/packets when offloaded ARM: dts: msm: add CPU dai for additional proxy ports msm: mhi_dev: Cache event ring read pointer value Co-authored-by: Yaroslav Furman <yaro330@gmail.com> [@0ctobot: Reconcile drivers/platform/msm/ipa diff with kernel.lnx.4.14.r4-rel, this reverts the following, 2929dbc ("msm: ipa: support dtsi entry for auto config") 84fc4ca ("msm: ipa: Add support for auto") and partially re-applies the following commits: e1bc184 ("msm: ipa4: add generic header processing context") b0b55ea ("soc: qcom: dcc_v2: Add virtualization support for 32bit devices")] Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com> Conflicts: Documentation/devicetree/bindings/mhi/msm_mhi_dev.txt Documentation/devicetree/bindings/sound/qcom-audio-dev.txt drivers/bus/mhi/core/mhi_main.c drivers/gpu/drm/msm/dsi-staging/dsi_display.c drivers/gpu/drm/msm/sde/sde_encoder.c drivers/hid/usbhid/hiddev.c drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.c drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_core.c drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_core.h drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c drivers/media/platform/msm/camera/cam_utils/cam_debug_util.h drivers/misc/qseecom.c drivers/mtd/nand/nand_ids.c drivers/net/macsec.c drivers/platform/msm/ipa/ipa_api.c drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c drivers/platform/msm/mhi_dev/mhi.c drivers/platform/msm/mhi_dev/mhi.h drivers/soc/qcom/dcc_v2.c include/uapi/linux/msm_ipa.h
0ctobot · May 12, 2020 · b460eaf · b460eaf
2 parents bc165b1 + d4b9c3f
commit b460eaf
Show file tree

Hide file tree

Showing 216 changed files with 8,150 additions and 2,692 deletions.
diff --git a/Documentation/devicetree/bindings/cnss/cnss-wlan.txt b/Documentation/devicetree/bindings/cnss/cnss-wlan.txt
@@ -76,6 +76,9 @@ Optional properties:
                              specified in <min_uV max_uV load_uA delay_us>.
   - pcie-disable-l1: Boolean property to decide whether to disable PCIe L1 PM.
   - pcie-disable-l1ss: Boolean property to decide whether to disable PCIe L1ss.
+  - qcom,set-wlaon-pwr-ctrl: Boolean property to indicate if set
+                             WLAON_QFPROM_PWR_CTRL_REG register during power on
+                             and off sequences.
 
 List of chip specific sub nodes:
   - chip_cfg@X: represent chip specific configurations

diff --git a/Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt b/Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt
@@ -551,6 +551,8 @@ Optional properties:
 					is supported.
 - qcom,dsi-dyn-clk-list:		An u32 array which lists all the supported dsi bit clock
 					frequencies in Hz for the given panel.
+- qcom,dsi-dyn-clk-skip-timing-update:	Boolean to specify whether to skip phy timing parameter
+					update during dynamic clock switch.
 
 Required properties for sub-nodes:	None
 Optional properties:

diff --git a/Documentation/devicetree/bindings/fb/mdss-pll.txt b/Documentation/devicetree/bindings/fb/mdss-pll.txt
@@ -20,7 +20,8 @@ Required properties:
                         "qcom,mdss_dsi_pll_7nm",   "qcom,mdss_dp_pll_7nm",
 			"qcom,mdss_dsi_pll_28lpm", "qcom,mdss_dsi_pll_14nm",
 			"qcom,mdss_dp_pll_14nm", "qcom,mdss_hdmi_pll_28lpm",
-			"qcom,mdss_dsi_pll_7nm_v2"
+			"qcom,mdss_dsi_pll_7nm_v2",
+			"qcom,mdss_dsi_pll_sdm660"
 - cell-index:		Specifies the controller used
 - reg:			offset and length of the register set for the device.
 - reg-names :		names to refer to register sets related to this device

diff --git a/Documentation/devicetree/bindings/mhi/msm_mhi_dev.txt b/Documentation/devicetree/bindings/mhi/msm_mhi_dev.txt
@@ -31,6 +31,7 @@ Optional property:
 		MHI driver on the host. This property is required if iatu
 		property qcom,mhi-config-iatu is present.
   - qcom,enable-m2: If property is present M2 autonomous is enabled.
+  - qcom,no-m0-timeout: If property is present M0 timeout is not applied.
 
 MSM MHI DEV NET
 

diff --git a/Documentation/devicetree/bindings/pci/msm_ep_pcie.txt b/Documentation/devicetree/bindings/pci/msm_ep_pcie.txt
@@ -70,6 +70,7 @@ Optional Properties:
 	- qcom,msm-bus,num-paths
 	- qcom,msm-bus,vectors-KBps
   - qcom,pcie-m2-autonomous: Enable L1ss sleep/exit to support M2 autonomous mode.
+  - qcom,mhi-soc-reset-offset: AXI register offset to initiate a SOC reset.
 
 Example:
 

diff --git a/Documentation/devicetree/bindings/platform/msm/ipa.txt b/Documentation/devicetree/bindings/platform/msm/ipa.txt
@@ -63,8 +63,6 @@ memory allocation over a PCIe bridge
 				using wdi-2.0 or not
 - qcom,ipa-wdi3-over-gsi:       Boolean context flag to indicate whether
                                 using wdi-3.0 or not
-- qcom,ipa-config-is-auto:      Boolean context flag to indicate ipa to be
-                                used in auto config or not
 - qcom,bandwidth-vote-for-ipa:	Boolean context flag to indicate whether
 				ipa clock voting is done by bandwidth
 				voting via msm-bus-scale driver or not
@@ -114,6 +112,7 @@ memory allocation over a PCIe bridge
 				0 (use scm call),
 				1 (override scm call as though it returned true), and
 				2 (override scm call as though it returned false)
+- qcom,use-xbl-boot: Boolean to indicate XBL boot loading for IPA FW
 
 IPA pipe sub nodes (A2 static pipes configurations):
 

diff --git a/Documentation/devicetree/bindings/pwm/pwm-qcom.txt b/Documentation/devicetree/bindings/pwm/pwm-qcom.txt
@@ -0,0 +1,41 @@
+Qualcomm Technologies Inc. PWM controller
+
+PDM is used for generating density modulated signals that, after passing
+through a filter, become analog signals. It can produce fixed densities
+or alternate between densities to create variations in the analog signal.
+
+PWM has the following use:
+1) Duty cycle control of the backlight.
+
+
+Required properties:
+- compatible: should be "qcom,pdm-pwm"
+
+- reg: physical base address and length of the controller's registers.
+
+- clocks: clocks required for enabling PWM block.
+
+- #pwm-cells: shall contain 2.
+
+- pwm@<num> : defines pwm instances.
+
+- frame-index : each pwm has 10 frames 0-9 and they are designed to stand by
+		themselves independent of the other frame. For this reason,
+		each PWM instance has its own set of configuration registers.
+- frame-offset: offset of each pwm instance from base.
+
+Example:
+
+	pdm_pwm0: pdm_pwm_test@600000 {
+		compatible = "qcom,pdm-pwm";
+		reg = <0x600000 0xc000>;
+		clocks = <&clock_gcc GCC_PDM_AHB_CLK>,
+			<&clock_gcc GCC_PWM0_XO512_CLK>;
+		clock-names = "pdm_ahb_clk", "pwm_core_clk";
+		#pwm-cells = <2>;
+
+		pwm@0{
+			frame-index = <0>;
+			frame-offset = <0x1000>;
+		};
+	};
diff --git a/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt b/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
@@ -2376,3 +2376,22 @@ sound-9330 {
 		asoc-codec = <&stub_codec>;
 		asoc-codec-names = "msm-stub-codec.1";
 	};
+
+
+* msm-pcm-pcie
+
+Required properties:
+ - compatible : "qcom,msm-pcm-pcie"
+
+* PCIE ASoC Machine driver
+
+Required properties:
+- compatible : "qcom,sm8150-asoc-snd-pcie".
+- qcom,model : The user-visible name of this sound card.
+
+Example:
+
+snd_934x {
+»       compatible = "qcom,sm8150-asoc-snd-pcie";
+»       qcom,model = "sm8150-pcie-snd-card";
+};
diff --git a/arch/arm/configs/vendor/qcs403-perf_defconfig b/arch/arm/configs/vendor/qcs403-perf_defconfig
@@ -248,6 +248,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=900
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_UEVENT=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
 CONFIG_USB_CONFIGFS_F_DIAG=y
 CONFIG_MMC=y
 CONFIG_MMC_PERF_PROFILING=y

diff --git a/arch/arm/configs/vendor/qcs403_defconfig b/arch/arm/configs/vendor/qcs403_defconfig
@@ -385,6 +385,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=900
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_UEVENT=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
 CONFIG_USB_CONFIGFS_F_DIAG=y
 CONFIG_MMC=y
 CONFIG_MMC_PERF_PROFILING=y

diff --git a/arch/arm/configs/vendor/qcs405-perf_defconfig b/arch/arm/configs/vendor/qcs405-perf_defconfig
@@ -231,6 +231,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=900
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_UEVENT=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
 CONFIG_USB_CONFIGFS_F_DIAG=y
 CONFIG_MMC=y
 CONFIG_MMC_PERF_PROFILING=y

diff --git a/arch/arm/configs/vendor/qcs405_defconfig b/arch/arm/configs/vendor/qcs405_defconfig
@@ -386,6 +386,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=900
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_UEVENT=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
 CONFIG_USB_CONFIGFS_F_DIAG=y
 CONFIG_MMC=y
 CONFIG_MMC_PERF_PROFILING=y

diff --git a/arch/arm/configs/vendor/sdxprairie-perf_defconfig b/arch/arm/configs/vendor/sdxprairie-perf_defconfig
@@ -157,7 +157,9 @@ CONFIG_BRIDGE_EBT_SNAT=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=y
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
 CONFIG_NET_SCH_PRIO=y
+CONFIG_NET_SCH_TBF=y
 CONFIG_QRTR=y
 CONFIG_QRTR_NODE_ID=2
 CONFIG_QRTR_SMD=y
@@ -194,6 +196,7 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_NETDEVICES=y
+CONFIG_MACSEC=y
 CONFIG_TUN=y
 CONFIG_AQFWD=y
 CONFIG_AQFWD_QCOM_IPA=y
@@ -467,7 +470,6 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_SELINUX_AVC_STATS is not set
 CONFIG_CRYPTO_ECDH=y
 CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_DES=y

diff --git a/arch/arm/configs/vendor/sdxprairie_defconfig b/arch/arm/configs/vendor/sdxprairie_defconfig
@@ -157,7 +157,9 @@ CONFIG_BRIDGE_EBT_SNAT=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=y
 CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
 CONFIG_NET_SCH_PRIO=y
+CONFIG_NET_SCH_TBF=y
 CONFIG_QRTR=y
 CONFIG_QRTR_NODE_ID=2
 CONFIG_QRTR_SMD=y
@@ -192,6 +194,7 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_NETDEVICES=y
+CONFIG_MACSEC=y
 CONFIG_TUN=y
 CONFIG_AQFWD=y
 CONFIG_AQFWD_QCOM_IPA=y
@@ -501,7 +504,6 @@ CONFIG_SECURITY_SELINUX=y
 # CONFIG_SECURITY_SELINUX_AVC_STATS is not set
 CONFIG_CRYPTO_ECDH=y
 CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_DES=y

diff --git a/arch/arm/mach-qcom/board-qcs403.c b/arch/arm/mach-qcom/board-qcs403.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -18,6 +18,8 @@
 static const char *qcs403_dt_match[] __initconst = {
 	"qcom,qcs403",
 	"qcom,qcs404",
+	"qcom,qcs405",
+	"qcom,qcs407",
 	NULL
 };
 

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
@@ -2497,10 +2497,8 @@ static int arm_iommu_init_mapping(struct device *dev,
 	u64 size = mapping->bits << PAGE_SHIFT;
 	int is_fast = 0;
 
-	if (mapping->init) {
-		kref_get(&mapping->kref);
+	if (mapping->init)
 		return 0;
-	}
 
 	/* currently only 32-bit DMA address space is supported */
 	if (size > DMA_BIT_MASK(32) + 1) {

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
@@ -13,9 +13,12 @@ dtb-$(CONFIG_ARCH_QCS403) += qcs403-iot-sku1.dtb \
 			qcs403-iot-sku3.dtb \
 			qcs403-iot-sku5.dtb \
 			qcs401-iot-sku5.dtb \
+			qcs404-iot-sku2.dtb \
 			qcs404-iot-sku3.dtb \
 			qcs404-iot-sku5.dtb \
-			qcs404-iot-sku6.dtb
+			qcs404-iot-sku6.dtb \
+			qcs405-iot-sku1.dtb \
+			qcs407-iot-sku1.dtb
 
 dtb-$(CONFIG_ARCH_QCS405) += qcs405-iot-sku1.dtb \
 		qcs407-iot-sku1.dtb \

diff --git a/arch/arm64/boot/dts/qcom/atoll-camera.dtsi b/arch/arm64/boot/dts/qcom/atoll-camera.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -497,19 +497,19 @@
 				};
 
 				iova-mem-region-io {
-					/* IO region is approximately 3 GB */
+					/* IO region is approximately 3.3 GB */
 					iova-region-name = "io";
-					iova-region-start = <0x10B11000>;
-					iova-region-len = <0xCF4EF000>;
+					iova-region-start = <0x10C00000>;
+					iova-region-len = <0xCF300000>;
 					iova-region-id = <0x3>;
 					status = "ok";
 				};
 
 				iova-mem-qdss-region {
-					/* qdss region is approximately 64K */
+					/* qdss region is approximately 1MB */
 					iova-region-name = "qdss";
 					iova-region-start = <0x10B00000>;
-					iova-region-len = <0x10000>;
+					iova-region-len = <0x100000>;
 					iova-region-id = <0x5>;
 					qdss-phy-addr = <0x16790000>;
 					status = "ok";

diff --git a/arch/arm64/boot/dts/qcom/atoll-lpi.dtsi b/arch/arm64/boot/dts/qcom/atoll-lpi.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -37,8 +37,10 @@
 					   <0x00000000>, <0x00000000>,
 					   <0x00000000>;
 
-		clock-names = "lpass_core_hw_vote";
-		clocks = <&lpass_core_hw_vote 0>;
+		clock-names = "lpass_core_hw_vote",
+				"lpass_audio_hw_vote";
+		clocks = <&lpass_core_hw_vote 0>,
+				<&lpass_audio_hw_vote 0>;
 
 		cdc_dmic01_clk_active: dmic01_clk_active {
 			mux {

diff --git a/arch/arm64/boot/dts/qcom/atoll-npu.dtsi b/arch/arm64/boot/dts/qcom/atoll-npu.dtsi
@@ -28,7 +28,8 @@
 			<GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "error_irq", "wdg_bite_irq", "ipc_irq",
 			"general_irq";
-		iommus = <&apps_smmu 0x1461 0x0>, <&apps_smmu 0x1462 0x0>,
+		iommus = <&apps_smmu 0x1441 0x0>, <&apps_smmu 0x1442 0x0>,
+			<&apps_smmu 0x1461 0x0>, <&apps_smmu 0x1462 0x0>,
 			<&apps_smmu 0x1481 0x0>, <&apps_smmu 0x1482 0x0>;
 
 		clocks = <&clock_npucc NPU_CC_XO_CLK>,

diff --git a/arch/arm64/boot/dts/qcom/atoll-sde-display.dtsi b/arch/arm64/boot/dts/qcom/atoll-sde-display.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -152,7 +152,9 @@
 		qcom,dsi-phy-num = <0>;
 
 		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0",
-					"cphy_byte_clk0", "cphy_pixel_clk0";
+					"cphy_byte_clk0", "cphy_pixel_clk0",
+					"shadow_cphybyte_clk0",
+					"shadow_cphypixel_clk0";
 		qcom,dsi-panel = <&dsi_nt36672c_video>;
 	};
 
@@ -169,11 +171,14 @@
 			<&mdss_dsi0_pll CPHY_BYTECLK_SRC_0_CLK>,
 			<&mdss_dsi0_pll CPHY_PCLK_SRC_0_CLK>,
 			 <&mdss_dsi0_pll SHADOW_BYTECLK_SRC_0_CLK>,
-			 <&mdss_dsi0_pll SHADOW_PCLK_SRC_0_CLK>;
+			 <&mdss_dsi0_pll SHADOW_PCLK_SRC_0_CLK>,
+			<&mdss_dsi0_pll SHADOW_CPHY_BYTECLK_SRC_0_CLK>,
+			<&mdss_dsi0_pll SHADOW_CPHY_PCLK_SRC_0_CLK>;
 		clock-names = "mux_byte_clk0", "mux_pixel_clk0",
 				"src_byte_clk0", "src_pixel_clk0",
 				"cphy_byte_clk0", "cphy_pixel_clk0",
-				"shadow_byte_clk0", "shadow_pixel_clk0";
+				"shadow_byte_clk0", "shadow_pixel_clk0",
+				"shadow_cphybyte_clk0", "shadow_cphypixel_clk0";
 
 		pinctrl-names = "panel_active", "panel_suspend";
 		pinctrl-0 = <&sde_te_active &disp_pins_default>;
@@ -363,6 +368,10 @@
 	qcom,dsi-supported-dfps-list = <60 90 50>;
 	qcom,mdss-dsi-pan-enable-dynamic-fps;
 	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";
+	qcom,dsi-dyn-clk-enable;
+	qcom,dsi-dyn-clk-skip-timing-update;
+	qcom,dsi-dyn-clk-list =
+		<1052068500 1047684883 1043301259 1038917642 1034534025>;
 	qcom,mdss-dsi-display-timings {
 		timing@0{
 			qcom,mdss-dsi-panel-phy-timings = [00 23 09 09 26 24 09

diff --git a/arch/arm64/boot/dts/qcom/atoll.dtsi b/arch/arm64/boot/dts/qcom/atoll.dtsi
@@ -3015,6 +3015,7 @@
 			     <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */ >,
 			     <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */ >;
 		qcom,wlan-msa-fixed-region = <&wlan_fw_mem>;
+		qcom,hyp_disabled;
 		vdd-cx-mx-supply = <&L9A>;
 		vdd-1.8-xo-supply = <&L1C>;
 		vdd-1.3-rfa-supply = <&L2C>;

diff --git a/arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi b/arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi
@@ -441,6 +441,16 @@
 			qcom,msm-dai-q6-dev-id = <32770>;
 		};
 
+		proxy_rx: qcom,msm-dai-q6-proxy-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <8194>;
+		};
+
+		proxy_tx: qcom,msm-dai-q6-proxy-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <8195>;
+		};
+
 		usb_audio_rx: qcom,msm-dai-q6-usb-audio-rx {
 			compatible = "qcom,msm-dai-q6-dev";
 			qcom,msm-dai-q6-dev-id = <28672>;
@@ -815,4 +825,8 @@
 		compatible = "qcom,msm-dai-q6-dev";
 		qcom,msm-dai-q6-dev-id = <24577>;
 	};
+
+	pcie: qcom,msm-pcm-pcie {
+		compatible = "qcom,msm-pcm-pcie";
+	};
 };