Promotion of kernel.lnx.4.4-160827.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1006500   I5570d7694424d0a602c446c0af098a64ffa681e4   soc: qcom: rpm-smd: Account for NOACK messages with syst
1055113   I38474a228ec7b245dc330b4a37847c9f1bf29c2a   smb138x: fix WD bite
1038520   I097349ad4d2e8ffbafbeb5fe65910894fe909bd6   host: sdhci: fix current caps when there is no host->vmm
1033897   Ic4d206da3dc6b45214e7601e7556cfb0bef81a7d   clk: msm: mdss: update Dp PLL/Phy configuration
1046961   I5c210097a6b3daedce52c4dda806c698cda63968   input: touchscreen: ft5x06: add FT5336 firmware update s
1054643   I3a04cc902c74b49e1d40c5a52acbf1f7c907c34e   ASoC: wcd934x: add ASRC mixing support
1049012   I6f66d3136e3c49da54f5919184bc113267105463   ASoC: wcd934x: Add support for voltage scaling
1055113   I8979d203fc7c35ec23e23874c8dd8f980a1cc619   qcom-charger: smb138x: fix buck damage on v1.1 hardware
1056412   Ie3b012b524ef24c48937c0bb388cac656c3ebcf8   icnss: Add support for recovery
1054672   I029f327406ca00b2370c93134158b61dda3b81e3   sched: Remove unused PELT extensions for HMP scheduling
967956   Ica3c32007bc9b8acce79c5bb2175790ff27180d0   cnss: Disable wlan irq when PCIe link down is detected
1046961   I84fc2a6d30f831b4b054780b107ce105614855ea   input: ft5x06_ts: add support for pinctrl framework
1054672   I6be476834ce70274aec5a52fd9455b5f0065af87   sched: Consolidate CONFIG_SCHED_HMP sections in various
1056422   I06e1b0134cea58adedbd9113a51529b2b73da835   ASoC: wcd934x: Add support for DSD audio playback
1053758   I439f8ad817ba66210c934115979c276577194c11   msm: mink: Adding SMCInvoke Driver
1009096   If9968c319f86ef66571fa8fcbb952910fabec5ad   msm: ipa3: not configure ipa_rx_hps registers
1058382   I55e483be5629cfe26cca3b740d206845a1caa903   msm: mdss: add additional LM checks for dest scalar vali
1009901   I8e964c6bb8d6d8fb6f4bfba17a6b24b97509953c   cnss: Expose Power Up/Down API to WLAN Functional Driver
1013494   I271ba273a4c70717f066d219ff02e8f0f56e2ac3   cnss: Provide API to CLD Driver to control SPDT GPIO
1048766   Ie9064e669424096fee8c35cddccab29faf60cc6b   usb: hcd: Add USB atomic notifier callback for HC died e
1049910   If4fb44d217ed84067a0732334523ddb1e435e4e7   msm: mdss: Correct command mode MISR CRC reg offset and
1057979   I3efbae24a1f6384be1e603fb56f0d3baef61d924   cpuset: Make cpusets restore on hotplug
1053927   If1837dd7c8120c8b097cfffa1dc52eb4781f1641   sched: inherit the group id from the group leader
1046961   I85d24bfc68a7777053c15f28a84027260c68cebd   input: touchscreen: ft5x06: fix firmware force update is
1054449   I7677bef6a58c028876b72dbade37c1064b428ee2   clk: msm: gcc-cobalt: Remove support for wcss clocks
1058737   Iefe24525a9551736a6044697b447a25e2c5c65ca   input: synaptics_dsx_2.6: remove fake touch points
1058737 990820   Ie2f6f5b736b27792e6e4dc2c39064e0ebdc03d7b   input: synaptics_dsx_2.6: Add support for clocks for sec
1054539   I61c4cd6bd0ecf06969aa26a04911f28b292f7942   regulator: cpr3-mmss-regulator: update ref voltages for
1046961   I429f48126bd5d28c6dbf6ba846175d5e643dd436   input: touchscreen: request threaded-only IRQs with IRQF
1054414   I2f44b44a27ae93c6dd46cc6829d68ea1117ba237   msm: ipa3: remove wrong smmu clk vote
1050304   I22cc2f3fee518fa3d29af11fa277dad4da4db728   msm: misc: hdcp: add support for multi-part hdcp2p2 mess
1054414   I98726deff99b373344fe75f8bdcb11fcad83e621   ARM: dts: msm: Add bus bandwidth entry for IPA
1056422   Ib038cf81f29e00c08def789f8f186ca4615d45fc   ASoC: msm: Add support for playback over slimbus2 rx por
1056786   I191127fafb26bcf10ea25f972fe5af122debf292   regulator: cpr3: fix panic callback failure in interrupt
1054866   Ic9462fef751f9442ae504c09fbf4418e08f018b0   sched/fair: Add flag to indicate why we picked the CPU
1058737   Id43118120d4a1f0682904f48b3584d3ba62ef1dd   input: synaptics_dsx_2.6: creation of secure touch sysfs
1054672   Ia1aa0405e8d7c7c48fe8023691b57fba00c6a22b   defconfig: Remove CONFIG_SCHED_FREQ_INPUT from all defco
1046961   Ied34d548bff27f8f6da9f4c81896e4505cdce218   input: ft5x06_ts: add NULL pointer check
1037647   Ic7a17a907e70122968c324e3cbe6e0421c28a2c9   scsi: ufs: fix race between hibern8 failure recovery and
1055335   I9426d3651c704fbef302c6d49170c9e996cb9179   ARM: dts: msm: Add initial support for msmcobalt QRD SKU
1053927   Iebc7d74d6fafa20430fa1c7d80f34a6ab198832d   sched: handle frequency alert notifications better
1040200   If97793a3af6c2d460468432c7bee93583cc34a55   msm: ipa: add mhi test suite
1052110   I2f04d861d98af2cf4009a1f746d91e9e9923ce42   msm: ipa3: Fix unclocked access to IPA SMEM register
1050838   I7010005b37b4709f54de58d52a56cb7f5e88bd08   usb: gadget: gsi: Handle EVT_HOST_READY event in STATE_I
1054672   Ia20e40d8a088d50909cc28f5be758fa3e9a4af6f   sched: Remove all existence of CONFIG_SCHED_FREQ_INPUT
1057031   I1e9f9956af6d35b33ae24d69ff3c5d3aa695a26b   msm: mdss: dsi: fix the check for PLL off when turning o
1027110   Ied1229da9e9f72c25343533b933fdcfcb7f80975   icnss: Add hardware reset logic
1046961   I77cedabdb234a643f96427f051038faad31bfdcf   input: ft5x06_ts: remove deprecated apis in 3.18 kernel
1044772   Ib45424c70f995d856ad27107ae3ea24a59ca4e74   msm: vidc: Fix multistream issues
1055130   I7fe6c7c636207cd4f85d468f61c87e5a4e12b0ac   usb: gadget: f_gsi: Fix alternate index returned by gsi_
1053687   I0432111cb8581925b82c02b5944285855a92ca62   ARM: dts: msm: configure CX voltage levels from MDSS for
1044072   I454e04d05cfcb7af8fc4bd2b4a1bade55c4684d0   msm: ipa: handle information leak on ADD_FLT_RULE_INDEX
1054460   I60cce19bd82030990a1267b81ed28c25ac8601ec   diag: Add diag over glink support
1054672   Ifc5812cfe14ebf2b4d447100dcd87f02ab29ff7a   sched: Move CPU cstate tracking under CONFIG_SCHED_HMP
1021945   I776ead0030cad167afcf41ab985db7151a42d126   qseecom: support whitelist memory for qseecom_send_modfd
1054672   Ib067ac75e5a494008dcb3c67586b622c1b3962ce   sched: Move most HMP specific code to a separate file.
1009284 1044351   Iab3c9d578cf398f57d3151a5c895c4a09ddb3dd2   mdss: display-port: add support for audio programming
1053895   I9b4c22a6f54367f58b482fbccfaa9e37d70667f4   defconfig: msm: Add support to build msmcobalt 32-bit
1005908   Idbb3b2524b3c2165e9922d934047b7ba46141a6c   msm: mdss: Fix potential NULL pointer dereferences
1055677   I2e5bd023d643d2fbba32f226c5eb85c39b620f3b   msm: ipa3: Adapt version handling to support IPAv3.5/3.5
1054672   Iad914f31b629e81e403b0e89796b2b0f1d081695   sched: Move notify_migration() under CONFIG_SCHED_HMP
1048190   I00ae7f088c7411c8a6420f5e7ab12276d65fd269   msm: ipa: header change for SMMU wlan VA mapping
1046961 566134   I3f6fda3fb5d0a717ae943a9113be89623c96ce61   input: touchscreen: ft5x06: remove unbalanced touch even
987021   Ie49eee9478f4657cfb2a994ba60da1ec4c356339   msm: mdss: hide kernel addresses from unprevileged users
1056422   I398db5f6deded10a515f05277b6316a93f9e14ab   ASoC: msm: Add support for native DSD playabck
1050304   Ib28eb08cc3c8a45a0e87ae1c4f84c904e66652f6   ARM: dts: msm: add hdcp support on msmcobalt v1
1046961   Idfc50da45891a1475ac6b35d80c7d725607cbf81   input: ft5x06_ts: check vendor id before upgrade FT firm
1011881   I2b3536f5eb2742d6b6855140c40724f6425d1578   msm: vidc: Use internal size for extradata plane
1058737   I40f3f380c1a85c292029d4e22e49bebf25bd198c   input: synaptics_dsx_2.6: fix CTP power issue for QRD895
1056422   Ica51d40911d16059e8af21c60794b35c68bb695d   ASoC: wcd934x: Add DSD volume support
996537   I0c6e7a6c2dc6a51fb19a9d31ceb6823fe9a05ae2   cnss: Control vdd-wlan-xtal-aon-supply regulator in cnss
1054352   Ibb082ce691625527e9a9ffd4978dea7ba4df9e84   misc: qcom: qdsp6v2: initialize wma_config_32
1056422   Ifb06674c251335a1d8cec71931355dca4c0e012d   ALSA: compress: Add DSD format support for ALSA
1058393   I246a5f5149e492aba4f7c3920296d4bd3d873de0   ARM: dts: msmcobalt: add status property for memlat-mon
1053516   If2fc2701548f90bb7ea9559a87752e13a7b0f736   msm: kgsl: remove un-used GPU power states
1056029   Ibdba6c1a4fc4ce75d8ba1b6c61353ab6662e7914   defconfig: Enable support for destroying TCP sockets thr
1056603   I7e830bc914eb9c159ae18f165bc8b0278ec9af40   sched: Make use of sysctl_sched_wake_to_idle in select_b
1054539   Id2084fd8913468372ad78ecf0d41427171f87bab   ARM: dts: msm: update VDD_GFX CPR target quotients for m
1033911   I1e4046dd4a7dbb66ad2502e210e58130f08a2b51   clk: msm: mdss: update DSI PLL programming for msmcobalt
1052854   I0f4f0e1e67f3097b567db006a7826a2d1fd7c2d6   qcom-charger: expand data structure smb_chg_param
1051709   I0f0a84a12c3ba514f7309b16c73f5b8ed631626d   msm: ipa3: add gateway info on wan_msg
1033911   I1993f5cedb629f44a5b07d429a77f17218f2d6e7   msm: mdss: dsi: update DSI phy v3 initialization sequenc
1058872   I0d0762bc29982e1c15171c9597d86894caa34eb9   msm: ADSPRPC: Update channel state during subsystem rest
1053927   Icfd91c85938def101a989af3597d3dcaa8026d16   sched: Introduce sched_freq_aggregate_threshold tunable
1053758   I4e869d276ce4e8ecfe35a9ffe6892a6b586fe372   defconfig: msm: enable SMCInvoke feature
1046961   I0ec72bbbf12320ad22608522d1250614c6686fe3   input: ft5x06_ts: pinctrl and gpio config in suspend/res
1046961   I465fdfa73e56e8fc4bbfdde980c558e4715d6d08   input: ft5x06_ts: add support for firmware update for CT
1055738   I1fcfce8e56b1d4e8b8f54457193cd547fb5e3de7   qcom-charger: qpnp-fg-gen3: add v2 SRAM register map
1056661   Ie0bde4d908189da86077b69be52c51f2a35596a8   ARM: dts: msm: Add GPU DCVS plan for msmcobalt V2
1055677   I2046318ba40beca75bdc2f40554fc9a458da5581   msm: ipa3: Update registers configurations for IPAv3.5/3
1049594   I530e35054fd512574bca9e5937317099f58d2bb6   clk: msm: clock: Add voter clocks for mmss_camss_jpeg0_c
990796   I1399cd8aa53d1c6fd6b8ff0c5cce66b978770dbd   cnss: Add optional property to control wlan_en gpio for
1054672   I29e69356da8d003d13d8cd3927a0b166cc1ef95e   sched: Fix compile issues for !CONFIG_SCHED_HMP
1048190   I7750102222d519969da0d597a6591aa728abb27a   msm: ipa: WA to get PA of sgt_tbl from wlan
1033911   I5b9a26bac000fd255daca0e55396d16e30ffd3f7   ARM: dts: msm: update DSI phy strength settings for msmc
1009284   I1f817e0c720dda0a9b1778f6aad653218ff9be60   msm: mdss: use external display as wrapper for operation
1051261   I442e87e780a790d0f00aa62bc0534b6f017fc02c   regulator: cprh-kbss-regulator: support the force highes
1054643 1056422   Id157439b2a46ac4fa54b4a768f9555cf390399b5   ASoC: wcd934x: Add support for codec MCLK2 enablement
1059549   I4b9028f8930ac2f3de6c043fa145494f37322160   qpnp-fg-gen3: export the battery float voltage
1047814 1054404   I260bbe5ddcb4da1bd175cafda2fbfec4a6e0cd39   msm: mdss: fix pipe priority validation
1054672   I9b033101b903dc49b8683025602d2af395501daa   Documentation: scheduler: Rename sched-zone.txt to sched
1046961   I7a6ec3a387536c512637b0bd8dab95e7cceca212   input: ft5x06_ts: add proximity feature support
1046961   Ifa02c0287195d7ce55fb2d8ac49ec1c8ae5baec9   input: ft5x06_ts: fix the Focaltech CTP current leakage
1049012   I1ce4f3f215850fada6c25192a4351f3a9c76a370   ASoC: wcd934x: add MAD support for wcd934x codec
1045859   If9b5ca8639d34f55a407ea953f95ba9d436bb7f1   ARM: dts: msm: Update SS phy initialization sequence for
1059516   Iaf9930c0589e193c8a366ff44808d75c6d6b360b   ARM: dts: msm: Update power attributes for msmcobalt
1059142   I9a1a478c857efd988984a0efb0a2b6475030c7ec   msm: mdss: update lineptr instantly in cmd mode panels w
1056488   I2c91e8ae6a30facefd5dd3d4a4e4c33ffc792fe1   msm: kgsl: Change sequencing for GPU hardware clock gati
1059101   I894631f6085410bd9961a0e00ca5eb2cd7d0c5bd   ARM: dts: Change minimum voltage for LDO25
1058750   I7b2a70188975b75a0fbcd2a6cb26f28cc0258532   soc: qcom: glink: Best Fit approach to find intent
1044351   I9b81f79043b4ea7355b99ba9d8347d79bed10153   mdss: display-port: fix Display-port disable sequence
1052515   Ide0ca4714679bb576a8069bdd7720507074ccc47   phy: qcom-ufs: update ufs phy settings
1046961   I869bd41270ea240c671e5478126a61d4ff2088dc   input: ft5x06: add support when CONFIG_PM is not defined
1058363   Iff3ee1009d9c3215433cc267f016ef9cf2a9bff2   qcom_charger: smb-lib: support faking battery capacity
1058737   I47520f9ba91b7645dff2c11b4c58a0b7aeed2765   input: synaptics_dsx_2.6: add secure touch support for S
1027110   I90859881a74e567a7bc2f46d68e47bc8a231bd25   ARM: dts: msm: Add required resources for reset
1054672   I3529e4356e15e342a5fcfbcf3654396752a1d7cd   sched: Remove unused migration notifier code.
1059549   Ia5ea1b139f5e9d560dc6492aa9fc13ffeeda83ca   qcom-charger: smb-lib: correct the usb suspend votable n
1056438   Iee1ccf5cbd7b767753a3115c0570e63fbe2aa8f3   coresight: abort coresight tracing on kernel crash
1058977   I70e0b87c3575f5778726ae2855d68bf0e560206a   ARM: dts: msm: Update GPU SMMU settings for cobalt
1058737 995687   I89d9f7cacbcf23de43a7e96556d1ac65911126d6   input: synaptics_dsx_2.6: fix issues raised by static an
1046961   Ic462f6483887a3654665852e58ae9891de9f5eff   input: touchscreen: change the focaltech firmware upgrad
1046961   I16a97fefc64dd171deb800b481aa74a797c9ad55   input: focaltech: release pinctrl resources on probe fai
1053927   I92e6fd3ca693387aeb0664cc75afde06f75d4a9f   proc: relax write permissions of sched_group_id file
1058737   Ica477f35bd4fda59eb49c9b4f5e88b460366c761   input: synaptics: defer touch resume to workqueue for v2
1054503   I049821c960e4b53901cc2a07290d6ccedb8b971b   icnss: Add support for multiple vreg and clocks
1057778   Ic126739d20ff6cd148b2f424746555419fcfca70   msm: ipa3: fix the dma_map_single issue
1053516   I5f118138eca307f7cc16405ff9c8897ecd510c12   msm: kgsl: remove GFX retention support
1055710   Ie7eff49f136fe429ef10c6067ce7d8aae2694d3a   msm: ipa: fix a static analysis issue at IPA unit-tests
1053895   Ia670dab963bd337bf3aa395e15f4ec8e8f213e1c   defconfig: msm: falcon: get up to date with msmcobalt de
1048190   I92922e494c745ea4c6bf4f473515dea4eccbd62e   msm: ipa3: add ipa-uc ram mapping to wlan-cb
1057085   I96bfd93ea5016a9c48f97262dbb0b5b63e07233d   soc: qcom: Clear PBL interrupt in case of error

Change-Id: Ie50835e7d5d44c19d89f4ef32dc1c7b22925e34e
CRs-Fixed: 1057085, 1044072, 1055710, 967956, 1054866, 1033897, 1058363, 1058737, 1009284, 1048190, 1013494, 990820, 1054414, 1006500, 1054643, 1054503, 1040200, 1054539, 1056786, 1046961, 1052110, 1056412, 566134, 1053687, 1058393, 1053895, 1033911, 1044772, 1056029, 1055738, 1052854, 1045859, 1050304, 1057031, 1059549, 1059142, 1057778, 1056438, 996537, 1059101, 1009901, 987021, 1059516, 1044351, 1053516, 1049910, 1009096, 1058977, 1038520, 1005908, 1056488, 1051709, 1056422, 990796, 1037647, 995687, 1021945, 1049594, 1054404, 1027110, 1055113, 1058382, 1056661, 1053758, 1054449, 1054352, 1049012, 1054460, 1054672, 1057979, 1050838, 1047814, 1052515, 1055677, 1053927, 1058750, 1056603, 1011881, 1055130, 1048766, 1055335, 1058872, 1051261

21 files changed, 389 insertions, 137 deletions

diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h
index 3fb1e45373da..b411a0be4e67 100644
--- a/include/dt-bindings/clock/msm-clocks-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-cobalt.h
@@ -244,9 +244,6 @@
 #define clk_gcc_usb30_sleep_clk			0xd0b65c92
 #define clk_gcc_usb3_phy_aux_clk		0x0d9a36e0
 #define clk_gcc_usb3_phy_pipe_clk		0xf279aff2
-#define clk_gcc_wcss_ahb_s0_clk			0x639a01c4
-#define clk_gcc_wcss_axi_m_clk			0xabc48ebd
-#define clk_gcc_wcss_ecahb_clk			0xf1815ce9
 #define clk_gcc_usb3_clkref_clk			0xb6cc8f00
 #define clk_gcc_hdmi_clkref_clk			0x4d4eec04
 #define clk_gcc_edp_clkref_clk			0xa8685c3f
@@ -260,7 +257,6 @@
 #define clk_gcc_qusb2phy_prim_reset		0x07550fa1
 #define clk_gcc_qusb2phy_sec_reset		0x3f3a87d0
 #define clk_gcc_mmss_noc_cfg_ahb_clk		0xb41a9d99
-#define clk_gcc_wcss_shdreg_ahb_clk		0x33459c85
 #define clk_gcc_dcc_ahb_clk			0xfa14a88c
 #define clk_hlos1_vote_lpass_core_smmu_clk	0x3aaa1743
 #define clk_hlos1_vote_lpass_adsp_smmu_clk	0xc76f702f
@@ -383,6 +379,8 @@
 #define clk_mmss_camss_gp1_clk			0xdccdd730
 #define clk_mmss_camss_ispif_ahb_clk		0xbda4f0e3
 #define clk_mmss_camss_jpeg0_clk		0x4cc73b07
+#define clk_mmss_camss_jpeg0_vote_clk		0xc9efa6ac
+#define clk_mmss_camss_jpeg0_dma_vote_clk	0x371ec109
 #define clk_mmss_camss_jpeg_ahb_clk		0xde1fece3
 #define clk_mmss_camss_jpeg_axi_clk		0x7534616b
 #define clk_mmss_camss_mclk0_clk		0x056293a7
@@ -463,11 +461,10 @@
 #define clk_dsi1pll_vco_clk			0x99797b50
 
 #define clk_dp_vco_clk				0xfcaaeec7
-#define clk_hsclk_divsel_clk_src		0x0a325543
 #define clk_dp_link_2x_clk_divsel_five		0xcfe3f5dd
-#define clk_dp_link_2x_clk_divsel_ten		0xfeb9924d
-#define clk_dp_link_2x_clk_mux			0xce4c4fc6
-#define clk_vco_divided_clk_src			0x3da6cb51
+#define clk_vco_divsel_four_clk_src		0xe0da19c0
+#define clk_vco_divsel_two_clk_src		0xb5cfc6a8
+#define clk_vco_divided_clk_src_mux		0x3f8197c2
 #define clk_hdmi_vco_clk			0xbb7dc20d
 
 /* clock_gpu controlled clocks*/
diff --git a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
index fe69171f464e..81d75bc9a8d6 100644
--- a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
@@ -213,10 +213,6 @@
 #define GCC_USB3_PHY_AUX_CBCR					0x50000
 #define GCC_USB3_PHY_PIPE_CBCR					0x50004
 #define GCC_USB3PHY_PHY_BCR					0x50024
-#define GCC_WCSS_AHB_S0_CBCR					0x11004
-#define GCC_WCSS_AXI_M_CBCR					0x11008
-#define GCC_WCSS_ECAHB_CBCR					0x1100C
-#define GCC_WCSS_SHDREG_AHB_CBCR				0x11010
 #define GCC_APCS_CLOCK_SLEEP_ENA_VOTE				0x52008
 #define GCC_MSS_CFG_AHB_CBCR					0x8A000
 #define GCC_MSS_Q6_BIMC_AXI_CBCR				0x8A040
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 903a8e852f5d..66bf56640fe1 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -194,10 +194,12 @@ struct coresight_device {
  * Operations available for sinks
  * @enable:	enables the sink.
  * @disable:	disables the sink.
+ * @abort:	captures sink trace on abort
  */
 struct coresight_ops_sink {
 	int (*enable)(struct coresight_device *csdev);
 	void (*disable)(struct coresight_device *csdev);
+	void (*abort)(struct coresight_device *csdev);
 };
 
 /**
@@ -239,6 +241,7 @@ extern int coresight_enable(struct coresight_device *csdev);
 extern void coresight_disable(struct coresight_device *csdev);
 extern int coresight_timeout(void __iomem *addr, u32 offset,
 			     int position, int value);
+extern void coresight_abort(void);
 #else
 static inline struct coresight_device *
 coresight_register(struct coresight_desc *desc) { return NULL; }
@@ -248,6 +251,7 @@ coresight_enable(struct coresight_device *csdev) { return -ENOSYS; }
 static inline void coresight_disable(struct coresight_device *csdev) {}
 static inline int coresight_timeout(void __iomem *addr, u32 offset,
 				     int position, int value) { return 1; }
+static inline void coresight_abort(void) {}
 #endif
 
 #if defined(CONFIG_OF) && defined(CONFIG_CORESIGHT)
diff --git a/include/linux/hdcp_qseecom.h b/include/linux/hdcp_qseecom.h
index 26e97700fc73..f66264bc935a 100644
--- a/include/linux/hdcp_qseecom.h
+++ b/include/linux/hdcp_qseecom.h
@@ -14,6 +14,8 @@
 #define __HDCP_QSEECOM_H
 #include <linux/types.h>
 
+#define HDCP_MAX_MESSAGE_PARTS 4
+
 enum hdcp_lib_wakeup_cmd {
 	HDCP_LIB_WKUP_CMD_INVALID,
 	HDCP_LIB_WKUP_CMD_START,
@@ -44,12 +46,25 @@ struct hdcp_lib_wakeup_data {
 	uint32_t timeout;
 };
 
+struct hdcp_msg_part {
+	uint32_t offset;
+	uint32_t length;
+};
+
+struct hdcp_msg_data {
+	uint32_t num_messages;
+	struct hdcp_msg_part messages[HDCP_MAX_MESSAGE_PARTS];
+	uint8_t rx_status;
+};
+
 struct hdmi_hdcp_wakeup_data {
 	enum hdmi_hdcp_wakeup_cmd cmd;
 	void *context;
 	char *send_msg_buf;
 	uint32_t send_msg_len;
 	uint32_t timeout;
+	uint8_t abort_mask;
+	const struct hdcp_msg_data *message_data;
 };
 
 static inline char *hdmi_hdcp_cmd_to_str(uint32_t cmd)
diff --git a/include/linux/input/ft5x06_ts.h b/include/linux/input/ft5x06_ts.h
index 1340737070f7..bd37af71fe0d 100644
--- a/include/linux/input/ft5x06_ts.h
+++ b/include/linux/input/ft5x06_ts.h
@@ -22,6 +22,7 @@
 #define FT5X16_ID		0x0A
 #define FT5X36_ID		0x14
 #define FT6X06_ID		0x06
+#define FT6X36_ID       0x36
 
 struct fw_upgrade_info {
 	bool auto_cal;
@@ -33,6 +34,14 @@ struct fw_upgrade_info {
 	u16 delay_erase_flash;
 };
 
+struct ft5x06_psensor_platform_data {
+	struct input_dev *input_psensor_dev;
+	struct sensors_classdev ps_cdev;
+	int tp_psensor_opened;
+	char tp_psensor_data; /* 0 near, 1 far */
+	struct ft5x06_ts_data *data;
+};
+
 struct ft5x06_ts_platform_data {
 	struct fw_upgrade_info info;
 	const char *name;
@@ -59,6 +68,7 @@ struct ft5x06_ts_platform_data {
 	bool no_force_update;
 	bool i2c_pull_up;
 	bool ignore_id_check;
+	bool psensor_support;
 	int (*power_init)(bool);
 	int (*power_on)(bool);
 };
diff --git a/include/linux/input/synaptics_dsx_v2_6.h b/include/linux/input/synaptics_dsx_v2_6.h
index 2b91bc043f6f..5d4bbedb5f1a 100644
--- a/include/linux/input/synaptics_dsx_v2_6.h
+++ b/include/linux/input/synaptics_dsx_v2_6.h
@@ -5,6 +5,7 @@
  *
  * Copyright (C) 2012 Alexandra Chin <alexandra.chin@tw.synaptics.com>
  * Copyright (C) 2012 Scott Lin <scott.lin@tw.synaptics.com>
+ * Copyright (C) 2016, 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 as published by
@@ -57,6 +58,7 @@ struct synaptics_dsx_button_map {
  * @x_flip: x flip flag
  * @y_flip: y flip flag
  * @swap_axes: swap axes flag
+ * @resume_in_workqueue: defer resume function to workqueue
  * @irq_gpio: attention interrupt GPIO
  * @irq_on_state: attention interrupt active state
  * @power_gpio: power switch GPIO
@@ -79,11 +81,13 @@ struct synaptics_dsx_button_map {
  * @bus_reg_name: pointer to name of regulator for bus pullup control
  * @cap_button_map: pointer to 0D button map
  * @vir_button_map: pointer to virtual button map
+ * @resume_in_workqueue: defer resume function to workqueue
  */
 struct synaptics_dsx_board_data {
 	bool x_flip;
 	bool y_flip;
 	bool swap_axes;
+	bool resume_in_workqueue;
 	int irq_gpio;
 	int irq_on_state;
 	int power_gpio;
diff --git a/include/linux/ipa.h b/include/linux/ipa.h
index 5f85508353c9..81da2aaa01e5 100644
--- a/include/linux/ipa.h
+++ b/include/linux/ipa.h
@@ -764,6 +764,7 @@ enum ipa_irq_type {
 	IPA_TX_SUSPEND_IRQ,
 	IPA_TX_HOLB_DROP_IRQ,
 	IPA_BAM_IDLE_IRQ,
+	IPA_BAM_GSI_IDLE_IRQ = IPA_BAM_IDLE_IRQ,
 	IPA_IRQ_MAX
 };
 
@@ -948,6 +949,8 @@ struct ipa_wdi_ul_params_smmu {
 	struct sg_table rdy_comp_ring;
 	phys_addr_t rdy_comp_ring_wp_pa;
 	u32 rdy_comp_ring_size;
+	u32 *rdy_ring_rp_va;
+	u32 *rdy_comp_ring_wp_va;
 };
 
 /**
diff --git a/include/linux/msm_ext_display.h b/include/linux/msm_ext_display.h
index 81a95657a719..54c99d9cb245 100644
--- a/include/linux/msm_ext_display.h
+++ b/include/linux/msm_ext_display.h
@@ -121,6 +121,7 @@ struct msm_ext_disp_init_data {
 	struct kobject *kobj;
 	struct msm_ext_disp_intf_ops intf_ops;
 	struct msm_ext_disp_audio_codec_ops codec_ops;
+	struct platform_device *pdev;
 };
 
 /*
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 06dd540192c7..74b2a11b1d1c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1232,9 +1232,6 @@ struct sched_avg {
 	u64 last_update_time, load_sum;
 	u32 util_sum, period_contrib;
 	unsigned long load_avg, util_avg;
-#ifdef CONFIG_SCHED_HMP
-	u32 runnable_avg_sum_scaled;
-#endif
 };
 
 #ifdef CONFIG_SCHEDSTATS
@@ -1308,12 +1305,10 @@ struct ravg {
 	u64 mark_start;
 	u32 sum, demand;
 	u32 sum_history[RAVG_HIST_SIZE_MAX];
-#ifdef CONFIG_SCHED_FREQ_INPUT
 	u32 curr_window, prev_window;
 	u16 active_windows;
 	u32 pred_demand;
 	u8 busy_buckets[NUM_BUSY_BUCKETS];
-#endif
 };
 
 struct sched_entity {
@@ -2155,32 +2150,6 @@ static inline cputime_t task_gtime(struct task_struct *t)
 extern void task_cputime_adjusted(struct task_struct *p, cputime_t *ut, cputime_t *st);
 extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut, cputime_t *st);
 
-struct sched_load {
-	unsigned long prev_load;
-	unsigned long new_task_load;
-	unsigned long predicted_load;
-};
-
-#if defined(CONFIG_SCHED_FREQ_INPUT)
-extern int sched_set_window(u64 window_start, unsigned int window_size);
-extern unsigned long sched_get_busy(int cpu);
-extern void sched_get_cpus_busy(struct sched_load *busy,
-				const struct cpumask *query_cpus);
-extern void sched_set_io_is_busy(int val);
-#else
-static inline int sched_set_window(u64 window_start, unsigned int window_size)
-{
-	return -EINVAL;
-}
-static inline unsigned long sched_get_busy(int cpu)
-{
-	return 0;
-}
-static inline void sched_get_cpus_busy(struct sched_load *busy,
-				       const struct cpumask *query_cpus) {};
-static inline void sched_set_io_is_busy(int val) {};
-#endif
-
 /*
  * Per process flags
  */
@@ -2349,10 +2318,6 @@ extern void do_set_cpus_allowed(struct task_struct *p,
 
 extern int set_cpus_allowed_ptr(struct task_struct *p,
 				const struct cpumask *new_mask);
-extern void sched_set_cpu_cstate(int cpu, int cstate,
-			 int wakeup_energy, int wakeup_latency);
-extern void sched_set_cluster_dstate(const cpumask_t *cluster_cpus, int dstate,
-				int wakeup_energy, int wakeup_latency);
 #else
 static inline void do_set_cpus_allowed(struct task_struct *p,
 				      const struct cpumask *new_mask)
@@ -2365,24 +2330,27 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p,
 		return -EINVAL;
 	return 0;
 }
-static inline void
-sched_set_cpu_cstate(int cpu, int cstate, int wakeup_energy, int wakeup_latency)
-{
-}
-
-static inline void sched_set_cluster_dstate(const cpumask_t *cluster_cpus,
-			int dstate, int wakeup_energy, int wakeup_latency)
-{
-}
 #endif
 
+struct sched_load {
+	unsigned long prev_load;
+	unsigned long new_task_load;
+	unsigned long predicted_load;
+};
+
 extern int sched_set_wake_up_idle(struct task_struct *p, int wake_up_idle);
 extern u32 sched_get_wake_up_idle(struct task_struct *p);
-extern int sched_set_group_id(struct task_struct *p, unsigned int group_id);
-extern unsigned int sched_get_group_id(struct task_struct *p);
 
-#ifdef CONFIG_SCHED_HMP
+struct cpu_cycle_counter_cb {
+	u64 (*get_cpu_cycle_counter)(int cpu);
+};
 
+#ifdef CONFIG_SCHED_HMP
+extern int sched_set_window(u64 window_start, unsigned int window_size);
+extern unsigned long sched_get_busy(int cpu);
+extern void sched_get_cpus_busy(struct sched_load *busy,
+				const struct cpumask *query_cpus);
+extern void sched_set_io_is_busy(int val);
 extern int sched_set_boost(int enable);
 extern int sched_set_init_task_load(struct task_struct *p, int init_load_pct);
 extern u32 sched_get_init_task_load(struct task_struct *p);
@@ -2391,9 +2359,42 @@ extern unsigned int sched_get_static_cpu_pwr_cost(int cpu);
 extern int sched_set_static_cluster_pwr_cost(int cpu, unsigned int cost);
 extern unsigned int sched_get_static_cluster_pwr_cost(int cpu);
 extern int sched_update_freq_max_load(const cpumask_t *cpumask);
-extern void sched_update_cpu_freq_min_max(const cpumask_t *cpus, u32 fmin, u32
-					  fmax);
-#else
+extern void sched_update_cpu_freq_min_max(const cpumask_t *cpus,
+							u32 fmin, u32 fmax);
+extern void sched_set_cpu_cstate(int cpu, int cstate,
+			 int wakeup_energy, int wakeup_latency);
+extern void sched_set_cluster_dstate(const cpumask_t *cluster_cpus, int dstate,
+				int wakeup_energy, int wakeup_latency);
+extern int register_cpu_cycle_counter_cb(struct cpu_cycle_counter_cb *cb);
+extern u64 sched_ktime_clock(void);
+extern int sched_set_group_id(struct task_struct *p, unsigned int group_id);
+extern unsigned int sched_get_group_id(struct task_struct *p);
+
+#else /* CONFIG_SCHED_HMP */
+static inline u64 sched_ktime_clock(void)
+{
+	return 0;
+}
+
+static inline int
+register_cpu_cycle_counter_cb(struct cpu_cycle_counter_cb *cb)
+{
+	return 0;
+}
+
+static inline int sched_set_window(u64 window_start, unsigned int window_size)
+{
+	return -EINVAL;
+}
+static inline unsigned long sched_get_busy(int cpu)
+{
+	return 0;
+}
+static inline void sched_get_cpus_busy(struct sched_load *busy,
+				       const struct cpumask *query_cpus) {};
+
+static inline void sched_set_io_is_busy(int val) {};
+
 static inline int sched_set_boost(int enable)
 {
 	return -EINVAL;
@@ -2406,7 +2407,17 @@ static inline int sched_update_freq_max_load(const cpumask_t *cpumask)
 
 static inline void sched_update_cpu_freq_min_max(const cpumask_t *cpus,
 					u32 fmin, u32 fmax) { }
-#endif
+
+static inline void
+sched_set_cpu_cstate(int cpu, int cstate, int wakeup_energy, int wakeup_latency)
+{
+}
+
+static inline void sched_set_cluster_dstate(const cpumask_t *cluster_cpus,
+			int dstate, int wakeup_energy, int wakeup_latency)
+{
+}
+#endif /* CONFIG_SCHED_HMP */
 
 #ifdef CONFIG_NO_HZ_COMMON
 void calc_load_enter_idle(void);
@@ -2441,8 +2452,6 @@ extern u64 local_clock(void);
 extern u64 running_clock(void);
 extern u64 sched_clock_cpu(int cpu);
 
-extern u64 sched_ktime_clock(void);
-
 extern void sched_clock_init(void);
 extern int sched_clock_initialized(void);
 
@@ -3379,9 +3388,4 @@ static inline unsigned long rlimit_max(unsigned int limit)
 	return task_rlimit_max(current, limit);
 }
 
-struct cpu_cycle_counter_cb {
-	u64 (*get_cpu_cycle_counter)(int cpu);
-};
-int register_cpu_cycle_counter_cb(struct cpu_cycle_counter_cb *cb);
-
 #endif
diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
index 3e5fd5619367..1f9c2c734b20 100644
--- a/include/linux/sched/sysctl.h
+++ b/include/linux/sched/sysctl.h
@@ -40,21 +40,14 @@ extern unsigned int sysctl_sched_min_granularity;
 extern unsigned int sysctl_sched_wakeup_granularity;
 extern unsigned int sysctl_sched_child_runs_first;
 extern unsigned int sysctl_sched_wake_to_idle;
-extern unsigned int sysctl_sched_wakeup_load_threshold;
+
+#ifdef CONFIG_SCHED_HMP
+extern int sysctl_sched_freq_inc_notify;
+extern int sysctl_sched_freq_dec_notify;
 extern unsigned int sysctl_sched_window_stats_policy;
 extern unsigned int sysctl_sched_ravg_hist_size;
 extern unsigned int sysctl_sched_cpu_high_irqload;
-
-#if defined(CONFIG_SCHED_FREQ_INPUT) || defined(CONFIG_SCHED_HMP)
 extern unsigned int sysctl_sched_init_task_load_pct;
-#endif
-
-#ifdef CONFIG_SCHED_FREQ_INPUT
-extern int sysctl_sched_freq_inc_notify;
-extern int sysctl_sched_freq_dec_notify;
-#endif
-
-#ifdef CONFIG_SCHED_HMP
 extern unsigned int sysctl_sched_spill_nr_run;
 extern unsigned int sysctl_sched_spill_load_pct;
 extern unsigned int sysctl_sched_upmigrate_pct;
@@ -66,11 +59,11 @@ extern unsigned int sysctl_sched_big_waker_task_load_pct;
 extern unsigned int sysctl_sched_select_prev_cpu_us;
 extern unsigned int sysctl_sched_enable_colocation;
 extern unsigned int sysctl_sched_restrict_cluster_spill;
-#if defined(CONFIG_SCHED_FREQ_INPUT)
 extern unsigned int sysctl_sched_new_task_windows;
 extern unsigned int sysctl_sched_pred_alert_freq;
 extern unsigned int sysctl_sched_freq_aggregate;
-#endif
+extern unsigned int sysctl_sched_enable_thread_grouping;
+extern unsigned int sysctl_sched_freq_aggregate_threshold_pct;
 
 #else /* CONFIG_SCHED_HMP */
 
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 246945be000c..55240f9a3b94 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1896,8 +1896,11 @@ static inline int usb_translate_errors(int error_code)
 #define USB_DEVICE_REMOVE	0x0002
 #define USB_BUS_ADD		0x0003
 #define USB_BUS_REMOVE		0x0004
+#define USB_BUS_DIED		0x0005
 extern void usb_register_notify(struct notifier_block *nb);
 extern void usb_unregister_notify(struct notifier_block *nb);
+extern void usb_register_atomic_notify(struct notifier_block *nb);
+extern void usb_unregister_atomic_notify(struct notifier_block *nb);
 
 /* debugfs stuff */
 extern struct dentry *usb_debug_root;
diff --git a/include/net/cnss.h b/include/net/cnss.h
index ab9b50100504..5508d5e46d18 100644
--- a/include/net/cnss.h
+++ b/include/net/cnss.h
@@ -19,6 +19,8 @@
 
 #ifdef CONFIG_CNSS
 #define CNSS_MAX_FILE_NAME	20
+#define PINCTRL_SLEEP  0
+#define PINCTRL_ACTIVE 1
 
 enum cnss_bus_width_type {
 	CNSS_BUS_WIDTH_NONE,
@@ -242,4 +244,7 @@ extern void cnss_common_schedule_recovery_work(struct device *dev);
 extern int cnss_common_set_wlan_mac_address(struct device *dev, const u8 *in,
 					    uint32_t len);
 extern u8 *cnss_common_get_wlan_mac_address(struct device *dev, uint32_t *num);
+extern int cnss_power_up(struct device *dev);
+extern int cnss_power_down(struct device *dev);
+extern int cnss_sdio_configure_spdt(bool state);
 #endif /* _NET_CNSS_H_ */
diff --git a/include/soc/qcom/qseecomi.h b/include/soc/qcom/qseecomi.h
index 1349a3440e22..b0a8d67f50fa 100644
--- a/include/soc/qcom/qseecomi.h
+++ b/include/soc/qcom/qseecomi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016, 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,7 @@
 
 #define QSEECOM_KEY_ID_SIZE   32
 
+#define QSEOS_RESULT_FAIL_SEND_CMD_NO_THREAD  -19   /*0xFFFFFFED*/
 #define QSEOS_RESULT_FAIL_UNSUPPORTED_CE_PIPE -63
 #define QSEOS_RESULT_FAIL_KS_OP               -64
 #define QSEOS_RESULT_FAIL_KEY_ID_EXISTS       -65
@@ -64,6 +65,9 @@ enum qseecom_qceos_cmd_id {
 	QSEOS_TEE_REQUEST_CANCELLATION,
 	QSEOS_CONTINUE_BLOCKED_REQ_COMMAND,
 	QSEOS_RPMB_CHECK_PROV_STATUS_COMMAND = 0x1B,
+	QSEOS_CLIENT_SEND_DATA_COMMAND_WHITELIST = 0x1C,
+	QSEOS_TEE_OPEN_SESSION_WHITELIST = 0x1D,
+	QSEOS_TEE_INVOKE_COMMAND_WHITELIST = 0x1E,
 	QSEOS_FSM_LTEOTA_REQ_CMD = 0x109,
 	QSEOS_FSM_LTEOTA_REQ_RSP_CMD = 0x110,
 	QSEOS_FSM_IKE_REQ_CMD = 0x203,
@@ -181,6 +185,8 @@ __packed struct qseecom_client_send_data_ireq {
 	uint32_t req_len;
 	uint32_t rsp_ptr;/* First 4 bytes should be the return status */
 	uint32_t rsp_len;
+	uint32_t sglistinfo_ptr;
+	uint32_t sglistinfo_len;
 };
 
 __packed struct qseecom_client_send_data_64bit_ireq {
@@ -190,6 +196,8 @@ __packed struct qseecom_client_send_data_64bit_ireq {
 	uint32_t req_len;
 	uint64_t rsp_ptr;
 	uint32_t rsp_len;
+	uint64_t sglistinfo_ptr;
+	uint32_t sglistinfo_len;
 };
 
 __packed struct qseecom_reg_log_buf_ireq {
@@ -292,6 +300,8 @@ __packed struct qseecom_qteec_ireq {
 	uint32_t    req_len;
 	uint32_t    resp_ptr;
 	uint32_t    resp_len;
+	uint32_t    sglistinfo_ptr;
+	uint32_t    sglistinfo_len;
 };
 
 __packed struct qseecom_qteec_64bit_ireq {
@@ -301,6 +311,8 @@ __packed struct qseecom_qteec_64bit_ireq {
 	uint32_t    req_len;
 	uint64_t    resp_ptr;
 	uint32_t    resp_len;
+	uint64_t    sglistinfo_ptr;
+	uint32_t    sglistinfo_len;
 };
 
 __packed struct qseecom_client_send_fsm_key_req {
@@ -658,4 +670,37 @@ __packed struct qseecom_continue_blocked_request_ireq {
 #define TZ_OS_CONTINUE_BLOCKED_REQUEST_ID_PARAM_ID \
 	TZ_SYSCALL_CREATE_PARAM_ID_1(TZ_SYSCALL_PARAM_TYPE_VAL)
 
+#define TZ_APP_QSAPP_SEND_DATA_WITH_WHITELIST_ID \
+	TZ_SYSCALL_CREATE_SMC_ID(TZ_OWNER_TZ_APPS, \
+	TZ_SVC_APP_ID_PLACEHOLDER, 0x06)
+
+#define TZ_APP_QSAPP_SEND_DATA_WITH_WHITELIST_ID_PARAM_ID \
+	TZ_SYSCALL_CREATE_PARAM_ID_7( \
+	TZ_SYSCALL_PARAM_TYPE_VAL, TZ_SYSCALL_PARAM_TYPE_BUF_RW, \
+	TZ_SYSCALL_PARAM_TYPE_VAL, TZ_SYSCALL_PARAM_TYPE_BUF_RW, \
+	TZ_SYSCALL_PARAM_TYPE_VAL, TZ_SYSCALL_PARAM_TYPE_BUF_RW, \
+	TZ_SYSCALL_PARAM_TYPE_VAL)
+
+#define TZ_APP_GPAPP_OPEN_SESSION_WITH_WHITELIST_ID			\
+	TZ_SYSCALL_CREATE_SMC_ID(TZ_OWNER_TZ_APPS,			\
+	TZ_SVC_APP_ID_PLACEHOLDER, 0x07)
+
+#define TZ_APP_GPAPP_OPEN_SESSION_WITH_WHITELIST_ID_PARAM_ID		\
+	TZ_SYSCALL_CREATE_PARAM_ID_7(					\
+	TZ_SYSCALL_PARAM_TYPE_VAL, TZ_SYSCALL_PARAM_TYPE_BUF_RW,	\
+	TZ_SYSCALL_PARAM_TYPE_VAL, TZ_SYSCALL_PARAM_TYPE_BUF_RW,	\
+	TZ_SYSCALL_PARAM_TYPE_VAL, TZ_SYSCALL_PARAM_TYPE_BUF_RW,	\
+	TZ_SYSCALL_PARAM_TYPE_VAL)
+
+#define TZ_APP_GPAPP_INVOKE_COMMAND_WITH_WHITELIST_ID			\
+	TZ_SYSCALL_CREATE_SMC_ID(TZ_OWNER_TZ_APPS,			\
+	TZ_SVC_APP_ID_PLACEHOLDER, 0x09)
+
+#define TZ_APP_GPAPP_INVOKE_COMMAND_WITH_WHITELIST_ID_PARAM_ID		\
+	TZ_SYSCALL_CREATE_PARAM_ID_7(					\
+	TZ_SYSCALL_PARAM_TYPE_VAL, TZ_SYSCALL_PARAM_TYPE_BUF_RW,	\
+	TZ_SYSCALL_PARAM_TYPE_VAL, TZ_SYSCALL_PARAM_TYPE_BUF_RW,	\
+	TZ_SYSCALL_PARAM_TYPE_VAL, TZ_SYSCALL_PARAM_TYPE_BUF_RW,	\
+	TZ_SYSCALL_PARAM_TYPE_VAL)
+
 #endif /* __QSEECOMI_H_ */
diff --git a/include/sound/apr_audio-v2.h b/include/sound/apr_audio-v2.h
index 3464726c408a..695e33f4d1cf 100644
--- a/include/sound/apr_audio-v2.h
+++ b/include/sound/apr_audio-v2.h
@@ -3375,6 +3375,7 @@ struct afe_lpass_core_shared_clk_config_command {
 #define DEFAULT_COPP_TOPOLOGY				0x00010314
 #define DEFAULT_POPP_TOPOLOGY				0x00010BE4
 #define COMPRESSED_PASSTHROUGH_DEFAULT_TOPOLOGY         0x0001076B
+#define COMPRESS_PASSTHROUGH_NONE_TOPOLOGY      0x00010774
 #define VPM_TX_SM_ECNS_COPP_TOPOLOGY			0x00010F71
 #define VPM_TX_DM_FLUENCE_COPP_TOPOLOGY			0x00010F72
 #define VPM_TX_QMIC_FLUENCE_COPP_TOPOLOGY		0x00010F75
@@ -3590,6 +3591,15 @@ struct asm_ape_cfg {
 	u32 seek_table_present;
 };
 
+struct asm_dsd_cfg {
+	u16 num_version;
+	u16 is_bitwise_big_endian;
+	u16 dsd_channel_block_size;
+	u16 num_channels;
+	u8  channel_mapping[8];
+	u32 dsd_data_rate;
+};
+
 struct asm_softpause_params {
 	u32 enable;
 	u32 period;
@@ -4158,6 +4168,19 @@ struct asm_ape_fmt_blk_v2 {
 
 } __packed;
 
+struct asm_dsd_fmt_blk_v2 {
+	struct apr_hdr hdr;
+	struct asm_data_cmd_media_fmt_update_v2 fmtblk;
+
+	u16 num_version;
+	u16 is_bitwise_big_endian;
+	u16 dsd_channel_block_size;
+	u16 num_channels;
+	u8  channel_mapping[8];
+	u32 dsd_data_rate;
+
+} __packed;
+
 #define ASM_MEDIA_FMT_AMRNB_FS                  0x00010BEB
 
 /* Enumeration for 4.75 kbps AMR-NB Encoding mode. */
@@ -4566,6 +4589,7 @@ struct asm_amrwbplus_fmt_blk_v2 {
 #define ASM_MEDIA_FMT_ALAC                   0x00012F31
 #define ASM_MEDIA_FMT_VORBIS                 0x00010C15
 #define ASM_MEDIA_FMT_APE                    0x00012F32
+#define ASM_MEDIA_FMT_DSD                    0x00012F3E
 
 
 /* Media format ID for adaptive transform acoustic coding. This
@@ -9565,6 +9589,7 @@ enum {
 	LEGACY_PCM = 0,
 	COMPRESSED_PASSTHROUGH,
 	COMPRESSED_PASSTHROUGH_CONVERT,
+	COMPRESSED_PASSTHROUGH_DSD,
 };
 
 #define AUDPROC_MODULE_ID_COMPRESSED_MUTE                0x00010770
diff --git a/include/sound/q6asm-v2.h b/include/sound/q6asm-v2.h
index 8339d538d578..dadc2f7a4eae 100644
--- a/include/sound/q6asm-v2.h
+++ b/include/sound/q6asm-v2.h
@@ -52,6 +52,7 @@
 #define FORMAT_G711_ALAW_FS 0x001a
 #define FORMAT_G711_MLAW_FS 0x001b
 #define FORMAT_DTS          0x001c
+#define FORMAT_DSD          0x001d
 
 #define ENCDEC_SBCBITRATE   0x0001
 #define ENCDEC_IMMEDIATE_DECODE 0x0002
@@ -471,6 +472,9 @@ int q6asm_stream_media_format_block_vorbis(struct audio_client *ac,
 int q6asm_media_format_block_ape(struct audio_client *ac,
 			struct asm_ape_cfg *cfg, int stream_id);
 
+int q6asm_media_format_block_dsd(struct audio_client *ac,
+			struct asm_dsd_cfg *cfg, int stream_id);
+
 int q6asm_ds1_set_endp_params(struct audio_client *ac,
 				int param_id, int param_value);
 
diff --git a/include/trace/events/exception.h b/include/trace/events/exception.h
new file mode 100644
index 000000000000..6b525da1432e
--- /dev/null
+++ b/include/trace/events/exception.h
@@ -0,0 +1,124 @@
+/* Copyright (c) 2012-2016, 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.
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM exception
+
+#if !defined(_TRACE_EXCEPTION_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_EXCEPTION_H
+
+#include <linux/tracepoint.h>
+
+struct task_struct;
+
+TRACE_EVENT(user_fault,
+
+	TP_PROTO(struct task_struct *tsk, unsigned long addr, unsigned int fsr),
+
+	TP_ARGS(tsk, addr, fsr),
+
+	TP_STRUCT__entry(
+		__string(task_name, tsk->comm)
+		__field(unsigned long, addr)
+		__field(unsigned int, fsr)
+	),
+
+	TP_fast_assign(
+	__assign_str(task_name, tsk->comm)
+		__entry->addr	= addr;
+		__entry->fsr	= fsr;
+	),
+
+	TP_printk("task_name:%s addr:%lu, fsr:%u", __get_str(task_name),
+		__entry->addr, __entry->fsr)
+);
+
+
+struct pt_regs;
+
+TRACE_EVENT(undef_instr,
+
+	TP_PROTO(struct pt_regs *regs, void *prog_cnt),
+
+	TP_ARGS(regs, prog_cnt),
+
+	TP_STRUCT__entry(
+		__field(void *, prog_cnt)
+		__field(struct pt_regs *, regs)
+	),
+
+	TP_fast_assign(
+		__entry->regs		= regs;
+		__entry->prog_cnt	= prog_cnt;
+	),
+
+	TP_printk("pc:%p", __entry->prog_cnt)
+);
+
+TRACE_EVENT(unhandled_abort,
+
+	TP_PROTO(struct pt_regs *regs, unsigned long addr, unsigned int fsr),
+
+	TP_ARGS(regs, addr, fsr),
+
+	TP_STRUCT__entry(
+		__field(struct pt_regs *, regs)
+		__field(unsigned long, addr)
+		__field(unsigned int, fsr)
+	),
+
+	TP_fast_assign(
+		__entry->regs	= regs;
+		__entry->addr	= addr;
+		__entry->fsr	= fsr;
+	),
+
+	TP_printk("addr:%lu, fsr:%u", __entry->addr, __entry->fsr)
+);
+
+TRACE_EVENT(kernel_panic,
+
+	TP_PROTO(long dummy),
+
+	TP_ARGS(dummy),
+
+	TP_STRUCT__entry(
+		__field(long, dummy)
+	),
+
+	TP_fast_assign(
+		__entry->dummy	= dummy;
+	),
+
+	TP_printk("dummy:%ld", __entry->dummy)
+);
+
+TRACE_EVENT(kernel_panic_late,
+
+	TP_PROTO(long dummy),
+
+	TP_ARGS(dummy),
+
+	TP_STRUCT__entry(
+		__field(long, dummy)
+	),
+
+	TP_fast_assign(
+		__entry->dummy	= dummy;
+	),
+
+	TP_printk("dummy:%ld", __entry->dummy)
+);
+
+#endif
+
+#include <trace/define_trace.h>
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 2c69b5a3c2f4..f35630045c2f 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -76,10 +76,8 @@ TRACE_EVENT(sched_enq_deq_task,
 		__field(unsigned int,	cpus_allowed		)
 #ifdef CONFIG_SCHED_HMP
 		__field(unsigned int,	demand			)
-#ifdef CONFIG_SCHED_FREQ_INPUT
 		__field(unsigned int,	pred_demand		)
 #endif
-#endif
 	),
 
 	TP_fast_assign(
@@ -94,18 +92,13 @@ TRACE_EVENT(sched_enq_deq_task,
 		__entry->cpus_allowed	= cpus_allowed;
 #ifdef CONFIG_SCHED_HMP
 		__entry->demand		= p->ravg.demand;
-#ifdef CONFIG_SCHED_FREQ_INPUT
 		__entry->pred_demand	= p->ravg.pred_demand;
 #endif
-#endif
 	),
 
 	TP_printk("cpu=%d %s comm=%s pid=%d prio=%d nr_running=%u cpu_load=%lu rt_nr_running=%u affine=%x"
 #ifdef CONFIG_SCHED_HMP
-		 " demand=%u"
-#ifdef CONFIG_SCHED_FREQ_INPUT
-		 " pred_demand=%u"
-#endif
+		 " demand=%u pred_demand=%u"
 #endif
 			, __entry->cpu,
 			__entry->enqueue ? "enqueue" : "dequeue",
@@ -113,10 +106,7 @@ TRACE_EVENT(sched_enq_deq_task,
 			__entry->prio, __entry->nr_running,
 			__entry->cpu_load, __entry->rt_nr_running, __entry->cpus_allowed
 #ifdef CONFIG_SCHED_HMP
-			, __entry->demand
-#ifdef CONFIG_SCHED_FREQ_INPUT
-			, __entry->pred_demand
-#endif
+			, __entry->demand, __entry->pred_demand
 #endif
 			)
 );
@@ -126,9 +116,9 @@ TRACE_EVENT(sched_enq_deq_task,
 TRACE_EVENT(sched_task_load,
 
 	TP_PROTO(struct task_struct *p, bool boost, int reason,
-		 bool sync, bool need_idle, bool fast_path, int best_cpu),
+		 bool sync, bool need_idle, u32 flags, int best_cpu),
 
-	TP_ARGS(p, boost, reason, sync, need_idle, fast_path, best_cpu),
+	TP_ARGS(p, boost, reason, sync, need_idle, flags, best_cpu),
 
 	TP_STRUCT__entry(
 		__array(	char,	comm,	TASK_COMM_LEN	)
@@ -138,7 +128,7 @@ TRACE_EVENT(sched_task_load,
 		__field(	int,	reason			)
 		__field(	bool,	sync			)
 		__field(	bool,	need_idle		)
-		__field(	bool,	fast_path		)
+		__field(	u32,	flags			)
 		__field(	int,	best_cpu		)
 		__field(	u64,	latency			)
 	),
@@ -151,17 +141,17 @@ TRACE_EVENT(sched_task_load,
 		__entry->reason		= reason;
 		__entry->sync		= sync;
 		__entry->need_idle	= need_idle;
-		__entry->fast_path	= fast_path;
+		__entry->flags		= flags;
 		__entry->best_cpu	= best_cpu;
 		__entry->latency	= p->state == TASK_WAKING ?
 						      sched_ktime_clock() -
 						      p->ravg.mark_start : 0;
 	),
 
-	TP_printk("%d (%s): demand=%u boost=%d reason=%d sync=%d need_idle=%d fast_path=%d best_cpu=%d latency=%llu",
+	TP_printk("%d (%s): demand=%u boost=%d reason=%d sync=%d need_idle=%d flags=%x best_cpu=%d latency=%llu",
 		__entry->pid, __entry->comm, __entry->demand,
 		__entry->boost, __entry->reason, __entry->sync,
-		__entry->need_idle, __entry->fast_path,
+		__entry->need_idle, __entry->flags,
 		__entry->best_cpu, __entry->latency)
 );
 
@@ -291,7 +281,6 @@ TRACE_EVENT(sched_update_task_ravg,
 		__field(unsigned int,	demand			)
 		__field(unsigned int,	sum			)
 		__field(	 int,	cpu			)
-#ifdef CONFIG_SCHED_FREQ_INPUT
 		__field(unsigned int,	pred_demand		)
 		__field(	u64,	rq_cs			)
 		__field(	u64,	rq_ps			)
@@ -304,7 +293,6 @@ TRACE_EVENT(sched_update_task_ravg,
 		__field(	u64,	nt_cs			)
 		__field(	u64,	nt_ps			)
 		__field(	u32,	active_windows		)
-#endif
 	),
 
 	TP_fast_assign(
@@ -322,7 +310,6 @@ TRACE_EVENT(sched_update_task_ravg,
 		__entry->demand         = p->ravg.demand;
 		__entry->sum            = p->ravg.sum;
 		__entry->irqtime        = irqtime;
-#ifdef CONFIG_SCHED_FREQ_INPUT
 		__entry->pred_demand     = p->ravg.pred_demand;
 		__entry->rq_cs          = rq->curr_runnable_sum;
 		__entry->rq_ps          = rq->prev_runnable_sum;
@@ -335,28 +322,19 @@ TRACE_EVENT(sched_update_task_ravg,
 		__entry->nt_cs		= rq->nt_curr_runnable_sum;
 		__entry->nt_ps		= rq->nt_prev_runnable_sum;
 		__entry->active_windows	= p->ravg.active_windows;
-#endif
 	),
 
-	TP_printk("wc %llu ws %llu delta %llu event %s cpu %d cur_freq %u cur_pid %d task %d (%s) ms %llu delta %llu demand %u sum %u irqtime %llu"
-#ifdef CONFIG_SCHED_FREQ_INPUT
-		" pred_demand %u rq_cs %llu rq_ps %llu cur_window %u prev_window %u nt_cs %llu nt_ps %llu active_wins %u grp_cs %lld grp_ps %lld, grp_nt_cs %llu, grp_nt_ps: %llu"
-#endif
+	TP_printk("wc %llu ws %llu delta %llu event %s cpu %d cur_freq %u cur_pid %d task %d (%s) ms %llu delta %llu demand %u sum %u irqtime %llu pred_demand %u rq_cs %llu rq_ps %llu cur_window %u prev_window %u nt_cs %llu nt_ps %llu active_wins %u grp_cs %lld grp_ps %lld, grp_nt_cs %llu, grp_nt_ps: %llu"
 		, __entry->wallclock, __entry->win_start, __entry->delta,
 		task_event_names[__entry->evt], __entry->cpu,
 		__entry->cur_freq, __entry->cur_pid,
 		__entry->pid, __entry->comm, __entry->mark_start,
 		__entry->delta_m, __entry->demand,
-		__entry->sum, __entry->irqtime
-#ifdef CONFIG_SCHED_FREQ_INPUT
-		, __entry->pred_demand, __entry->rq_cs, __entry->rq_ps,
-		__entry->curr_window, __entry->prev_window,
-		  __entry->nt_cs, __entry->nt_ps,
-		  __entry->active_windows,
-		__entry->grp_cs, __entry->grp_ps,
-		__entry->grp_nt_cs, __entry->grp_nt_ps
-#endif
-		)
+		__entry->sum, __entry->irqtime, __entry->pred_demand,
+		__entry->rq_cs, __entry->rq_ps, __entry->curr_window,
+		__entry->prev_window, __entry->nt_cs, __entry->nt_ps,
+		__entry->active_windows, __entry->grp_cs,
+		__entry->grp_ps, __entry->grp_nt_cs, __entry->grp_nt_ps)
 );
 
 TRACE_EVENT(sched_get_task_cpu_cycles,
@@ -402,9 +380,7 @@ TRACE_EVENT(sched_update_history,
 		__field(	 int,	samples			)
 		__field(enum task_event,	evt		)
 		__field(unsigned int,	demand			)
-#ifdef CONFIG_SCHED_FREQ_INPUT
 		__field(unsigned int,	pred_demand		)
-#endif
 		__array(	 u32,	hist, RAVG_HIST_SIZE_MAX)
 		__field(unsigned int,	nr_big_tasks		)
 		__field(	 int,	cpu			)
@@ -417,27 +393,19 @@ TRACE_EVENT(sched_update_history,
 		__entry->samples        = samples;
 		__entry->evt            = evt;
 		__entry->demand         = p->ravg.demand;
-#ifdef CONFIG_SCHED_FREQ_INPUT
 		__entry->pred_demand     = p->ravg.pred_demand;
-#endif
 		memcpy(__entry->hist, p->ravg.sum_history,
 					RAVG_HIST_SIZE_MAX * sizeof(u32));
 		__entry->nr_big_tasks   = rq->hmp_stats.nr_big_tasks;
 		__entry->cpu            = rq->cpu;
 	),
 
-	TP_printk("%d (%s): runtime %u samples %d event %s demand %u"
-#ifdef CONFIG_SCHED_FREQ_INPUT
-		" pred_demand %u"
-#endif
+	TP_printk("%d (%s): runtime %u samples %d event %s demand %u pred_demand %u"
 		" (hist: %u %u %u %u %u) cpu %d nr_big %u",
 		__entry->pid, __entry->comm,
 		__entry->runtime, __entry->samples,
 		task_event_names[__entry->evt],
-		__entry->demand,
-#ifdef CONFIG_SCHED_FREQ_INPUT
-		__entry->pred_demand,
-#endif
+		__entry->demand, __entry->pred_demand,
 		__entry->hist[0], __entry->hist[1],
 		__entry->hist[2], __entry->hist[3],
 		__entry->hist[4], __entry->cpu, __entry->nr_big_tasks)
@@ -476,8 +444,6 @@ TRACE_EVENT(sched_reset_all_window_stats,
 		  __entry->old_val, __entry->new_val)
 );
 
-#ifdef CONFIG_SCHED_FREQ_INPUT
-
 TRACE_EVENT(sched_update_pred_demand,
 
 	TP_PROTO(struct rq *rq, struct task_struct *p, u32 runtime, int pct,
@@ -637,8 +603,6 @@ TRACE_EVENT(sched_freq_alert,
 		__entry->old_pred, __entry->new_pred)
 );
 
-#endif	/* CONFIG_SCHED_FREQ_INPUT */
-
 #endif	/* CONFIG_SCHED_HMP */
 
 /*
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 32172c8f7d37..0bac6947a1cb 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -520,3 +520,4 @@ header-y += android_pmem.h
 header-y += ipa_qmi_service_v01.h
 header-y += rmnet_ipa_fd_ioctl.h
 header-y += msm_ipa.h
+header-y += smcinvoke.h
diff --git a/include/uapi/linux/msm_ipa.h b/include/uapi/linux/msm_ipa.h
index 60ebda8be9cb..6aa021e12930 100644
--- a/include/uapi/linux/msm_ipa.h
+++ b/include/uapi/linux/msm_ipa.h
@@ -96,6 +96,11 @@
 #define IPA_MBIM_MAX_STREAM_NUM 8
 
 /**
+ *  size of the ipv6 address
+ */
+#define IPA_WAN_MSG_IPv6_ADDR_GW_LEN 4
+
+/**
  * the attributes of the rule (routing or filtering)
  */
 #define IPA_FLT_TOS			(1ul << 0)
@@ -1435,12 +1440,15 @@ struct ipa_ecm_msg {
  * @name: name of the wan interface
  *
  * CnE need to pass the name of default wan iface when connected/disconnected.
+ * CNE need to pass the gw info in wlan AP+STA mode.
  * netmgr need to pass the name of wan eMBMS iface when connected.
  */
 struct ipa_wan_msg {
 	char upstream_ifname[IPA_RESOURCE_NAME_MAX];
 	char tethered_ifname[IPA_RESOURCE_NAME_MAX];
 	enum ipa_ip_type ip;
+	uint32_t ipv4_addr_gw;
+	uint32_t ipv6_addr_gw[IPA_WAN_MSG_IPv6_ADDR_GW_LEN];
 };
 
 /**
diff --git a/include/uapi/linux/smcinvoke.h b/include/uapi/linux/smcinvoke.h
new file mode 100644
index 000000000000..1dc9a63c15e5
--- /dev/null
+++ b/include/uapi/linux/smcinvoke.h
@@ -0,0 +1,45 @@
+#ifndef _UAPI_SMCINVOKE_H_
+#define _UAPI_SMCINVOKE_H_
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#define SMCINVOKE_USERSPACE_OBJ_NULL	-1
+
+struct smcinvoke_buf {
+	uint64_t	addr;
+	uint64_t	size;
+};
+
+struct smcinvoke_obj {
+	int64_t		fd;
+	int64_t		reserved;
+};
+
+union smcinvoke_arg {
+	struct smcinvoke_buf	b;
+	struct smcinvoke_obj	o;
+};
+
+/*
+ * struct smcinvoke_cmd_req: This structure is transparently sent to TEE
+ * @op - Operation to be performed
+ * @counts - number of aruments passed
+ * @result - result of invoke operation
+ * @argsize - size of each of arguments
+ * @args - args is pointer to buffer having all arguments
+ */
+struct smcinvoke_cmd_req {
+	uint32_t	op;
+	uint32_t	counts;
+	int32_t		result;
+	uint32_t	argsize;
+	uint64_t __user args;
+};
+
+#define SMCINVOKE_IOC_MAGIC    0x98
+
+#define SMCINVOKE_IOCTL_INVOKE_REQ \
+	_IOWR(SMCINVOKE_IOC_MAGIC, 1, struct smcinvoke_cmd_req)
+
+#endif /* _UAPI_SMCINVOKE_H_ */
diff --git a/include/uapi/sound/compress_params.h b/include/uapi/sound/compress_params.h
index 4d9c4b5c29f3..47367c663011 100644
--- a/include/uapi/sound/compress_params.h
+++ b/include/uapi/sound/compress_params.h
@@ -97,7 +97,8 @@
 #define SND_AUDIOCODEC_EAC3                  ((__u32) 0x00000018)
 #define SND_AUDIOCODEC_ALAC                  ((__u32) 0x00000019)
 #define SND_AUDIOCODEC_APE                   ((__u32) 0x00000020)
-#define SND_AUDIOCODEC_MAX                   SND_AUDIOCODEC_APE
+#define SND_AUDIOCODEC_DSD                   ((__u32) 0x00000021)
+#define SND_AUDIOCODEC_MAX                   SND_AUDIOCODEC_DSD
 /*
  * Profile and modes are listed with bit masks. This allows for a
  * more compact representation of fields that will not evolve