Merge branch 'release-4.2.0-lineage'

* release-4.2.0-lineage:
  tri-state-key: send proper input when updating keycodes from userspace
  Revert "tri_state_key: import driver from msm8996"
  tri_state_key: import driver from msm8996
  block: Fix BFQ not being built
  msm: ais: ispif: Fix invalid type conversion
  msm: camera: isp: Fix invalid type conversion
  msm: wlan: Update ETSI1 and ETSI13 countries
  iommu/iommu-debug: fix buffer overflows in debugfs read functions
  usb: pd: Don't reject sink request based on max current
  f2fs: fix to account IO correctly
  msm: wlan: Update regulatory database
  msm: wlan: Remove DSRC channels for US
  msm: wlan: Add support for UNI-III ETSI sub-band
  ARM: dts: msm: Specify the temperature sensor name for msm8996
  msm: adsprpc: Fix memory out of bounds error
  msm: adsprpc: allocate all remote memory in kernel
  msm: ipa3: send usb-connect from rndis-ipa
  soc: qcom: fix race condition while freeing private data
  msm: adsprpc: allocate all remote memory in kernel
  msm: camera: Fix for OOB security CR
  msm: camera: Fix for OOB security CR
  msm: camera: Fix invalid type conversion
  msm: ais: Fix for OOB security CR
  drm/msm/sde: sanitize debugfs inputs when reading mdp memory
  diag: Mark Buffer as NULL after freeing
  ARM: dts: msm: Add initial dts support for SDM455 RCM devices
  msm: camera: isp: Reset request queue at stop
  msm: camera: isp: Fix drop frame due to reg update miss
  msm: camera: isp: Handle frame drop due to delay
  msm: ipa3: fix holb sequence for SSR
  msm: mdss: serialize dynamic fps and dynamic bit clock updates
  soc: swr-wcd: Apply div2 setting on slave side before bank switch
  ARM: dts: msm: Remove Out-of-Bound access
  usb: gadget: Fix double free of device descriptor pointers
  dwc3-msm: Do not resume usb3 phy if max speed is HS only
  msm: mdss: dsi: fix slab-out-of-bounds issue
  ANDROID: sdcardfs: Change current->fs under lock
  ANDROID: sdcardfs: Don't use OVERRIDE_CRED macro
  soc: qcom: scm: Add a noretry variant for scm_call2
  icnss: Remove WARN_ON during self recovery trigger
  msm: mdss: dsi: fix slab-out-of-bounds issue
  af_key: unconditionally clone on broadcast
  ASoC: Fix UBSAN warning at snd_soc_get/put_volsw_sx()
  msm: ADSPRPC: debugfs global and dsp file changes.
  ASoC: change mask in snd_soc_get/put_volsw_sx to unsigned int
  pppolac: pull udp header before sock enqueue
  af_key: unconditionally clone on broadcast
  soc: qcom: Remove smp2p test support
  soc: qcom: Remove smp2p test support
  soc: qcom: service-locator: Free PD list after client use
  msm: ipa3: Fix to validate the user inputs
  msm: ipa3: Fix to validate the user inputs
  coresight: fix handling of ETM management register access via sysfs
  icnss: NULL terminate the fw build timestamp string
  xfrm: validate template mode
  msm: kgsl: Don't halt dispatcher if device is not in SUSPEND state
  ARM: dts: msm: update dload type imem offset for MSM8998
  defconfig: msm: Disable EXT2 and EXT3 FS configs for MSM8998
  msm:ipa:Prevent rt rule deletion if rt rule id is invalid
  msm: kgsl: Correct the state transitions in suspend function
  msm: kgsl: create sysfs entries to expose memory usage
  clk: qcom: mdss: avoid release of the dynamic fps PLL code memory
  ARM: dts: msm: update the DSI bit clock for DSI panel on SDM660
  ARM: dts: msm: enable dynamic bit clock for SDM660 MTP panel
  msm: mdss: add support to switch the DSI clock dynamically
  ARM: dts: msm: add DT properties for dynamic refresh for SDM660/SDM630
  clk: qcom: mdss: add support for dynamic refresh on DSI 14nm PLL
  fbdev/msm: sanitize debugfs inputs when reading mdp memory
  msm: ipa: Protect ipa default routing table
  i2c-msm-v2: Handle Null pointer de-reference
  ARM: dts: msm: remove HOME gpio key for qrd devices
  ion: Ensure non-HLOS memory cannot be mapped by CPU
  usb: dwc3-msm: Release PM wakelock in host mode only for auto targets
  wcnss: Fix buffer overflow in wcnss_prealloc_get
  msm: camera: Fix arbitrary kernel write
  soc: soundwire: Fix wsa mute issue for stereo playback
  soc: swr-wcd-ctrl: Fix wsa mute issue for stereo playback
  ASoC: wsa881x: Fix regcache sync issue during playback
  icnss: Add check for rejuvenate in fw_down

arch/arm/boot/dts/qcom/Makefile

@@ -300,7 +300,9 @@ dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \
 	sdm630-pm660a-headset-jacktype-no-rcm.dtb \
 	sdm455-mtp.dtb \
 	sdm455-qrd.dtb \
-	sdm455-cdp.dtb
+	sdm455-cdp.dtb \
+	sdm455-rcm.dtb \
+	sdm455-internal-codec-rcm.dtb
 
 ifeq ($(CONFIG_ARM64),y)
 always          := $(dtb-y)

arch/arm/boot/dts/qcom/msm8996-gpu.dtsi

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017,2019 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
@@ -81,6 +81,7 @@
 
 		qcom,gpu-qdss-stm = <0x081c0000 0x40000>; // base addr, size
 
+		qcom,tsens-name = "tsens_tz_sensor14";
 		/* Trace bus */
 		coresight-id = <300>;
 		coresight-name = "coresight-gfx";

arch/arm/boot/dts/qcom/sdm455-internal-codec-rcm.dts

@@ -0,0 +1,24 @@
+/* Copyright (c) 2018, 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "sdm455.dtsi"
+#include "sdm455-rcm.dtsi"
+#include "sdm660-internal-codec.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDM455 Int. Audio Codec RCM";
+	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";
+	qcom,board-id = <21 1>;
+};

arch/arm/boot/dts/qcom/sdm455-rcm.dts

@@ -0,0 +1,34 @@
+/* Copyright (c) 2018, 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "sdm455.dtsi"
+#include "sdm455-rcm.dtsi"
+#include "sdm660-external-codec.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L RCM";
+	compatible = "qcom,sdm630-cdp", "qcom,sdm630", "qcom,cdp";
+	qcom,board-id = <21 0>;
+};
+
+&tavil_snd {
+	qcom,msm-mbhc-hphl-swh = <0>;
+	qcom,msm-mbhc-gnd-swh = <0>;
+};
+
+&tasha_snd {
+	qcom,msm-mbhc-hphl-swh = <0>;
+	qcom,msm-mbhc-gnd-swh = <0>;
+};

arch/arm/boot/dts/qcom/sdm455-rcm.dtsi

@@ -0,0 +1,13 @@
+/* Copyright (c) 2018, 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
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "sdm630-cdp.dtsi"