Promotion of kernel.lnx.4.4-160509.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
993103   I859e9de29436af12ef1af0e2ed85bcbb51d2e27a   ASoC: wcd-mbhc: Fix special headset detection issue
1012322   I03e9e92c2e01d1fece7e13dd412ea6128210f1fb   msm: ipa3: Send limited chained descriptors to IPA
1009097   Ice93347aaf81fe41ea7862752ac0d2d4e82d838c   clk: msm: osm: increase timer resolution programming to
989881   I6f4fe857996c8df996b6e4a0e4475a48740929fa   hwmon: qpnp-adc: Fix voltage scaling for VADC_HC periphe
1001242   I2f3d1bdb3ca1ba05c014c26bbc87879f549098d8   ASoC: msm8996: Add delay to check ADSP state during SSR
1010111   I13348a16e2e1c11053cf5b99b921fd8ea65c7d89   msm: thermal: Remove support for asynchronous cluster
1001092   I1f23fd6f28bb897824a1ef99a8873b9f986eee70   msm: camera: sensor: Validate step_boundary
987127   I10d1aaf3bb6cbf6358378667f93970e9eb21be1d   ASoC: msm: qdsp6v2: compress passthrough fixes
1013110   I1699ee96c65809a46331f94938c12fc1dd4d5384   soc: qcom: add support for the socinfo v0.12 format
1006564   I6a9b679bb083c695908972b377e8779e2f1cca60   msm: ipa: add a general function for assert
1010111   I105e98968b911f08b67c4e686e74ae6f7555d7be   ARM: dts: msm: Remove boot frequency mitigation for msmc
994830   I930b1883e167dcf25c43b417a2e66f5ed86d5ac1   defconfig: enable qseecom and tzlog drivers for msmcobal
1007339   Ia5e5b42598b7e32360267e42665a5ce3880aaeee   msm: vidc: Use Dcvs only when there is no resolution cha
1007397   I5c558ee2dbe2de20b9ac3f042ae45a9431590778   ASoC: msm: q6dspv2: add routes for SLIMBUS_7 and SLIMBUS
1009097   I60d90d546f155edb6c13c46e6c59c75e95848d6c   clk: msm: osm: support programming LMh SW override value
1001770   Id2554c9e6ed79188fa1b64728be464bda45f07ec   spmi: pmic_arb: use appropriate flow handler
994830   Ia87c3686ad09a80d965545c76f50ce4245d5477f   ARM: dts: msm: Add qseecom driver support for msmcobalt
1011319   I6654d9eec5a849bcce6d812166d6696347458169   ARM: dts: msm: Increase USB BAM device address space on
1010111   I69803580c9f747a0e2e5effa43d33f7a9a0d4e73   ARM: dts: msm: Remove wrong pop_mem sensor alias for msm
1011913   I5af8da01a54dc6f31c93f7ad5201899c0779b661   ARM: dts: msm: Update the memory map for msmcobalt
997601   I40695e9e7a99fe7c814d26fa7b5205370b7f9f64   msm: mdss: align yuv bitstream plane size and stride app
1005389   I1ca8f5748a56a9395caa8ed8ed18f70e69f0cbe8   power_supply: add INPUT_SUSPEND power supply property
1001767   I5465a944a79f622ddf69534075b067db0fb10c95   power: move QTI charger drivers to a new sub-directory a
1001770   Iccf0daadeb82b0fca29829424439ac225e2b3b88   spmi: pmic_arb: add a print in cleanup_irq
1013082   I5234f0511fa1c81072e740386e90e07f5e813dd0   icnss: Update icnss logs
1003921   I44a385af5c68b0bf656fc705a07251850fb38fde   defconfig: msmcortex: Enable USB PD drivers
1010120   Ia7ef920a0f34334e49d76efc5ba233aa58aeb273   msm: lmh_lite: Use dynamic memory for getting sensor lis
1000724   I8caa21c7b6a5f1e57cbd4c2bffeaa34e1e59d9c2   ARM: dts: msm: define primary display interface for msmc
1005389   I36796332af667874c1246ec35984122d45de6938   qcom-charger: introduce SMB charger library
1005389   I72274126a382ef8e32d89e1e8aa98348aaaac420   qcom-charger: pmic-voter: allow NULL callbacks
985637   I212f3edfa31e9168d11e0782da7f3fd8c2b98c5d   msm: ultrasound: Various static analysis fixes
1011135   I213bc12a089bdad75934959d0ccc8a6243f6124e   ARM: dts: msm: Update vrail comp factor for mdp masters
1011840   Ic67b72b1e9341fec33bcdbde67f9e2c7e8045ec1   msm: clock: clock-gcc-cobalt: Support QSPI clocks on MSM
997025   Ibbace116ac206007fa1928555838285304737737   ASoC: msm: qdsp6v2: DAP: Fix buffer overflow
1005389   Ia8dd2d6c8d51765dc49bdfa15565aed09c6a3893   ARM: dts: msm: add VBUS and VCONN regulators for msmcoba
1008505   I9c87fee27c6a6ef875100c9fc1b9d0cb7c14a2b5   msm: mdss: enable additonal clocks
1011314   I4d18273c6fc63baf58db1a778a1aaf3cb55e4824   soc: qcom: Vote ATB clock before clear registers
971295   Ib36697de003f6a59a608a0024d5351dc15ff8715   android: binder: Don't use sched_preempt_enable_no_resch
1003921   Ieba8e68761beef83a572b75b6b5f3b7ab7802e9e   usb: pd: Add initial support for USB Power Delivery
994830   I9dd3f6bf92e178f1207424b09f39f2e08164df17   qseecom: add a new flag commonlib64-loaded-by-uefi
983585   Ifbe1d91d68da81d058197af2a403c4b832b019fb   ASoC: msm: qdsp6v2: Fix memory allocation issues in audi
964814   I15a0abe365555a6695a7317e4d9cfae13a56c49e   ARM: dts: msm: Add WCN3990 slimbus device tree
987011   I6c79f82376936fc646b723872a96a6694fe47cd9   msm: camera: Avoid exposing kernel addresses
1009097   I6279cdbc92d4e0d5786854722474e1dfb14e7198   ARM: dts: msm: define LMh SW override values for OSM dev
988266   I4de6530f1fbffd9f3acd1fa539cf756364ea32ac   soc: qcom: glink: Fix ssr race condition in glink_close
1008400   I027a9ddbbbf6ff0ba7886151e5336d190ac3ce25   Revert "regulator: labibb: avail of simpler regulator re
1009740   I1a373a7602f8dbad3fb547690a87a28aea73aadd   ARM: dts: msm: add MDSS Display-Port PLL device node for
988942   I7c28a11f67517e5072e67c9bc2b99900a79879c1   ASoC: codecs: use correct subsystem status check
1003921   I75dec23c297fd5e07d14741e6627b473012b7a01   usb: pd: Add QPNP Power Delivery PHY driver
1009740   Ia8f60ba711770c26e5b5919d2c39d7986403ece6   ARM: dts: msm: setup external clock sources for DP clock
994830   I417a2e66f5ed86d5ac1930b1883e167dcf25c43b   ARM: dts: msm: Add tzdbg driver support for msmcobalt
1009622   I87d0b7c8280a57b88a9b9e7c6a2710e4694a2c0b   ARM: dts: msm: Add VADC_HC and BTM channels for msmcobal
1010111   I02b4bc9cf66b2734be99c986d4a200f604145e0a   defconfig: msmcortex: Enable thermal drivers for msmcoba
1009622   I989cfa4f40e7f1671f04dfa9d4c3fe2ccbbc44ab   thermal: qpnp-adc-tm: Support refreshed BTM driver
994830   I8370cc414d95067d4e30da0f53ddb15070ed4d05   ARM: dts: msm: add qseecom flag commonlib64-loaded-by-ue
986757   I4c2fdf70e518310157d81d527afff4436dd42140   ASoC: msm: qdsp6v2: Fix mute in WFD playback during ADSP
989628   Ida8bdb7da2fcb97023dce3b6eafe4b899a51cb66   ASoC: msm: audio-effects: fix stack overread and heap ov
786116   If0be35c3fac5274151bea87b738a48e6ec0ae891   kernel: Restrict permissions of /proc/iomem.
1008505   I09a7268861663761df716dd18f07069f6b1152ce   ARM: dts: msm: Add clocks MNOC AHB/AXI for smmu
997593 997601   Iaf740873a6814cd9211acf4de4042c7cefecd64d   msm: mdss: update CSC 10 bit matrix table with appropria
1003921   I42916b13e5d28dd3f3b0ed40c53767cbd7ae32b1   ARM: dts: msm: Add PD PHY peripheral to pmicobalt
991759   Iaeb3e148af57e9d484a31820993cf7e5b6466dd2   ASoC: msm: Update the Slmbus6 downlink hostless routing
938038   I617a8490784efd760651b3ec8780cc4fd4b17bae   regulator: qpnp-labibb: Add logic to skip second SWIRE c
1007397   I91306af6a2376fc76d51c62497e9723e6ec716e1   ARM: dts: msmcobalt: update CPU DAI list with SLIMBUS_7/
982349   Ica4c1442c1143f46de2baa6eaf1890ad0cb4b742   ASoC: msm: qdsp6v2: set token for stereo_to_custom_stere
996586   Ic0ab015098035418458a5ba7c2ffad9df20f933c   soundwire: Add API to control slave device data path
1009199   I42cd716dcb87b814256a81418fecdff020f37d9d   msm: ipa3: drain UL data for ECM/RNDIS tethering
978768   Iff1cb13d7b42b6ecfe6fd1fc88a111875c3d6cfa   msm: mdss: hdmi: separate out hdmi panel functionalities
1012221   I82d3dd00e003d8eab63ca6bcc3bb91d51f122606   msm: ipa3: enable rndis_ipa on msm-4.4
1010111   I69a5583e4e15499c54ce5b2ab0fe0538de303391   ARM: dts: msm: Update the emergency hotplug threshold fo
1009097   I6b53b5a6187f0ac0e68f4ed54c7ae3ba0b062222   ARM: dts: msm: increase OSM LLM frequency and voltage hy
1005389   I160ce3c8caae6999f52590099cf6d1de957dbbaf   qcom-charger: introduce QPNP SMB2 charger driver
1007397   Ifbf1778255edbe4901bd0860216ba1dd5a786047   ASoC: msm: qdsp6v2: add loopback volume control for SLIM
999158   If05a54ca2539ef452312548bfcaf7f3fadd1de87   ASoC: msm: qdsp6v2: update external EC reference logic
1007397   Id28b3d2fc5db4ec88ddbfa20b36047804d1fbdb6   ARM: dts: msm: add new CPU DAIs for SLIMBUS_7/8 Rx/Tx
1010111   I36a1ba6adb9ce847ae552d904dff1bbd0ce3cb77   ARM: dts: msm: Configure low voltage restricion for msmc
1008505   I4f106a39529f5e77591431bc3b4883a16d7b37f1   ARM: dts: msm: Add VBIF/Hysteresis support for mdss
1012355   I4836ad8a775b0ec0375e37d27fcbe380e661a7b2   clk: msm: clock-gcc-cobalt: Add new hw_ctl_clk type UFS
963833   Ie6b467292661358699fcab6263653139cda87c33   ASoC: wcd-mbhc: correct headphone detection
1012355   I24e78353fa07f537bafc322dba6b1ffac913cd1d   clk: msm: clock-local2: Add support for enabling clock H
1001770   I1415c41ec99ca4b767392ea3443691760f967953   spmi-pmic-arb: check apid enabled before calling the han
996961   I56882e3a5a01b017e1ba9cd63ab36933a3d469e7   regulator: labibb: fix standalone mode configuration
989828   Idb089ec8d036d441e32bc927d7294121a1d2735d   soc: qcom: q6dspv2: add priority to ADSP SSR notifier fo
1005389   Iba9b652335fba4ee4f24a17eba8abdd5c85c21bb   power_supply: Add additional USB Type-C properties
994035   Icccb28bc7a88dc76cf4ed5710623e992ba62f19c   clk: msm: clock-osm: increase refcount of CPU clocks at
1008594   I928ddfb44dfd52e8ba70d637219e3b5fbcdf8fa7   defconfig: enable msm serial console on msmcortex perf c
987739   Idecbe2f072e4315e180d25583b6d1b1237d06071   ASoC: msm: qdspv2: Add tertiary MI2S ports support
1005389   I03be96c229095b666d8e1a84c718989d84ec506e   ARM: dts: msm: add QPNP SMB2 charger device to PMICOBALT
1005389   I0ecabc0febd38ad55cee69bb415a0856a3e83a73   defconfig: arm64: msmcortex: enable QPNP_SMB2 support fo
1003921   I5323f82192960d1fd7d3a20baf040d6d80c06be5   usb: pd: Add Protocol layer and Policy Engine
1003365   If2371e06866a615ca7d7dad64a5d7a17f258b3b6   ASoC: wsa881x-analog: Fix warning in bandgap and clock c
996871   Ib7f002d52310dc13b60a18972a6899ebae21ba24   slim: msm: ngd: Add priority to DSP SSR notifier
1009740   Ic282c7e14fc6e23f4d044cb6a58249bdb4c8c2d8   clk: qcom: mdss: add Display-port pll clock driver suppo
1010120   I975c11aa4e63e01ee3274a577b51b37c1c0f78cd   msm: lmh_interface: Support new thermal core framework A
1010120   I56a8396a12e9b96cbed554bb1aed5d6243e6240a   ARM: dts: msm: Configure lmh hardware for msmcobalt
994268   I6ea23fdf8b119cfd178c4f5b79b9d1c01c267a82   ASoC: codec: micb ref count decrement check
971295   Ic406a232d0873662f80148e37acefe5243d912a0   android: binder: Use wake up hint for synchronous transa
1007397   Idc56625bb8fea263c3d530c8a9488eeb81fdd7e5   ASoC: msm: add Hostless DAI with SLIMBUS_8
1004520   I6c1760bc19f52e7d0c1c9834a72e2304f0ae28c8   soc: qcom: glink: Fix channel migration on fully open ch
1007397   Ia23572f44775a04c8f8c67e9a61d6b9be8869b82   ASoC: msmcobalt: add BT/FM audio support with WCN3990
1014232   Id8d941e69b70f1bcf709cedc969aa0500be92039   soc: qcom: Add more details to error log for PIL debuggi
989822   I8a64539a6a64fb8c75d06f933a735c70049bce7b   ASoC: msm: q6dspv2: initialize private data before using
999811   Id566359e381b69acfccff406c7448708701530e7   ASoC: msm: qdsp6v2: update quinary rx controls for voice
1010120   I2e6f6a181902bee7e3bcb0f366e6ee21f8a4c442   defconfig: msmcortex: Enable LMH hardware and interface
1007397   I839ac07a3ee1e1e778c4d1e43d0bac89f01bd21a   ASoC: msm: q6dspv2: add support for Slimbus 7 and 8 port
1003921   I5c3cf9a0239c0274709a1771e4fda8c6f5baaa77   usb: pd: Add sysfs entries
993882   Ia3d3e13d4bd7975a11cbeb96929fb224e8271916   ASoC: msm: qdsp6v2: Update set_params to avoid use befor
1010120   I12c496f3c72398845a9039607b27112196afe38a   msm: lmh_interface: support new sequence print functions

Change-Id: Ib73d0d04c5f94f7b2d9d0870b950f03368f59449
CRs-Fixed: 994035, 994268, 993103, 1012221, 996586, 991759, 989881, 983585, 964814, 989628, 987127, 1008400, 1009622, 1014232, 1005389, 1010111, 1008594, 1012322, 1001092, 988266, 996961, 1011913, 1006564, 1013110, 786116, 999811, 1001767, 994830, 1008505, 999158, 997025, 978768, 1007397, 971295, 997601, 987011, 986757, 1001770, 1013082, 1011135, 1003365, 1004520, 1007339, 1011840, 1009097, 1000724, 1012355, 1001242, 1011314, 997593, 1009199, 1010120, 988942, 993882, 963833, 938038, 996871, 989828, 1009740, 987739, 1003921, 982349, 989822, 985637, 1011319

10 files changed, 113 insertions, 11 deletions

diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h
index 829599aaf4de..99df0d53c312 100644
--- a/include/dt-bindings/clock/msm-clocks-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-cobalt.h
@@ -153,6 +153,7 @@
 #define clk_ufs_unipro_core_clk_src		0x179e80a9
 #define clk_usb30_mock_utmi_clk_src		0xa024a976
 #define clk_usb3_phy_aux_clk_src		0x15eec63c
+#define clk_qspi_ref_clk_src			0xfe6b8e11
 #define clk_gcc_pcie_phy_0_reset		0x6bb4df33
 #define clk_gcc_usb3_phy_reset			0x03d559f1
 #define clk_gcc_usb3phy_phy_reset		0xb1a4f885
@@ -227,14 +228,18 @@
 #define clk_gcc_tsif_ref_clk			0x8f1ed2c2
 #define clk_gcc_ufs_ahb_clk			0x1914bb84
 #define clk_gcc_ufs_axi_clk			0x47c743a7
+#define clk_gcc_ufs_axi_hw_ctl_clk		0x69385b45
 #define clk_gcc_ufs_ice_core_clk		0x310b0710
+#define clk_gcc_ufs_ice_core_hw_ctl_clk		0x84e15a5b
 #define clk_gcc_ufs_phy_aux_clk			0x17acc8fb
+#define clk_gcc_ufs_phy_aux_hw_ctl_clk		0x7dbdb2e2
 #define clk_gcc_ufs_rx_symbol_0_clk		0x7f43251c
 #define clk_gcc_ufs_rx_symbol_1_clk		0x03182fde
 #define clk_gcc_ufs_tx_symbol_0_clk		0x6a9f747a
 #define clk_ufs_tx_symbol_0_clk			0xb3fcd0f7
 #define clk_ufs_rx_symbol_0_clk			0x17a0f1cd
 #define clk_gcc_ufs_unipro_core_clk		0x2daf7fd2
+#define clk_gcc_ufs_unipro_core_hw_ctl_clk	0x4a4e0f3d
 #define clk_gcc_usb30_master_clk		0xb3b4e2cb
 #define clk_gcc_usb30_mock_utmi_clk		0xa800b65a
 #define clk_gcc_usb30_sleep_clk			0xd0b65c92
@@ -267,6 +272,8 @@
 #define clk_gcc_mss_mnoc_bimc_axi_clk		0xf665d03f
 #define clk_gpll0_out_msscc			0x7d794829
 #define clk_gcc_mss_snoc_axi_clk		0x0e71de85
+#define clk_gcc_qspi_ref_clk			0x766a0f7c
+#define clk_gcc_qspi_ahb_clk			0x96969dc8
 #define clk_gcc_debug_mux			0x8121ac15
 
 /* clock_mmss controlled clocks */
@@ -448,6 +455,13 @@
 #define clk_dsi1pll_bitclk_src			0x13ab045b
 #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
+
 /* clock_gpu controlled clocks*/
 #define clk_gpucc_xo				0xc4e1a890
 #define clk_gpucc_gpll0				0x0db0e37f
diff --git a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
index d637d123e714..a39433fa150f 100644
--- a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
@@ -113,6 +113,7 @@
 #define GCC_UFS_UNIPRO_CORE_CMD_RCGR				0x76028
 #define GCC_USB30_MOCK_UTMI_CMD_RCGR				0x0F028
 #define GCC_USB3_PHY_AUX_CMD_RCGR				0x5000C
+#define GCC_QSPI_REF_CMD_RCGR					0x9000C
 #define GCC_PCIE_0_PHY_BCR					0x6C01C
 #define GCC_HDMI_CLKREF_EN					0x88000
 #define GCC_UFS_CLKREF_EN					0x88004
@@ -230,6 +231,8 @@
 #define GCC_DCC_AHB_CBCR					0x84004
 #define GCC_HLOS1_VOTE_LPASS_CORE_SMMU_CBCR			0x7D010
 #define GCC_HLOS1_VOTE_LPASS_ADSP_SMMU_CBCR			0x7D014
+#define GCC_QSPI_AHB_CBCR					0x90004
+#define GCC_QSPI_REF_CBCR					0x90008
 
 #define GPUCC_GPU_PLL0_PLL_MODE					0x00000
 #define GPUCC_GPU_PLL0_USER_CTL_MODE				0x0000C
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 376645983d3e..b081a56e250f 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -177,6 +177,7 @@ enum power_supply_property {
 	POWER_SUPPLY_PROP_CHARGE_ENABLED,
 	POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED,
 	POWER_SUPPLY_PROP_CHARGING_ENABLED,
+	POWER_SUPPLY_PROP_INPUT_SUSPEND,
 	POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION,
 	POWER_SUPPLY_PROP_INPUT_CURRENT_MAX,
 	POWER_SUPPLY_PROP_INPUT_CURRENT_TRIM,
@@ -209,6 +210,10 @@ enum power_supply_property {
 	POWER_SUPPLY_PROP_RESTRICTED_CHARGING,
 	POWER_SUPPLY_PROP_CURRENT_CAPABILITY,
 	POWER_SUPPLY_PROP_TYPEC_MODE,
+	POWER_SUPPLY_PROP_TYPEC_CC_ORIENTATION, /* 0: N/C, 1: CC1, 2: CC2 */
+	POWER_SUPPLY_PROP_TYPEC_POWER_ROLE,
+	POWER_SUPPLY_PROP_PD_ALLOWED,
+	POWER_SUPPLY_PROP_PD_ACTIVE,
 	/* Local extensions of type int64_t */
 	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,
 	/* Properties of type `const char *' */
@@ -229,6 +234,7 @@ enum power_supply_type {
 	POWER_SUPPLY_TYPE_USB_ACA,	/* Accessory Charger Adapters */
 	POWER_SUPPLY_TYPE_USB_HVDCP,	/* High Voltage DCP */
 	POWER_SUPPLY_TYPE_USB_HVDCP_3,	/* Efficient High Voltage DCP */
+	POWER_SUPPLY_TYPE_USB_PD,	/* Power Delivery */
 	POWER_SUPPLY_TYPE_WIRELESS,	/* Accessory Charger Adapters */
 	POWER_SUPPLY_TYPE_BMS,		/* Battery Monitor System */
 	POWER_SUPPLY_TYPE_USB_PARALLEL,		/* USB Parallel Path */
@@ -238,6 +244,31 @@ enum power_supply_type {
 	POWER_SUPPLY_TYPE_DFP,		/* TYpe-C DFP */
 };
 
+/* Indicates USB Type-C CC connection status */
+enum power_supply_typec_mode {
+	POWER_SUPPLY_TYPEC_NONE,
+
+	/* Acting as source */
+	POWER_SUPPLY_TYPEC_SINK,			/* Rd only */
+	POWER_SUPPLY_TYPEC_SINK_POWERED_CABLE,		/* Rd/Ra */
+	POWER_SUPPLY_TYPEC_SINK_DEBUG_ACCESSORY,	/* Rd/Rd */
+	POWER_SUPPLY_TYPEC_SINK_AUDIO_ADAPTER,		/* Ra/Ra */
+	POWER_SUPPLY_TYPEC_POWERED_CABLE_ONLY,		/* Ra only */
+
+	/* Acting as sink */
+	POWER_SUPPLY_TYPEC_SOURCE_DEFAULT,		/* Rp default */
+	POWER_SUPPLY_TYPEC_SOURCE_MEDIUM,		/* Rp 1.5A */
+	POWER_SUPPLY_TYPEC_SOURCE_HIGH,			/* Rp 3A */
+	POWER_SUPPLY_TYPEC_NON_COMPLIANT,
+};
+
+enum power_supply_typec_power_role {
+	POWER_SUPPLY_TYPEC_PR_NONE,	/* CC lines in high-Z */
+	POWER_SUPPLY_TYPEC_PR_DUAL,
+	POWER_SUPPLY_TYPEC_PR_SINK,
+	POWER_SUPPLY_TYPEC_PR_SOURCE,
+};
+
 enum power_supply_notifier_events {
 	PSY_EVENT_PROP_CHANGED,
 };
diff --git a/include/linux/qpnp/qpnp-adc.h b/include/linux/qpnp/qpnp-adc.h
index e143b93ce020..8d51ddcd4246 100644
--- a/include/linux/qpnp/qpnp-adc.h
+++ b/include/linux/qpnp/qpnp-adc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
+ * 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
@@ -1062,7 +1062,7 @@ struct qpnp_vadc_chan_properties {
 	enum qpnp_adc_tm_channel_select		tm_channel_select;
 	enum qpnp_state_request			state_request;
 	enum qpnp_adc_calib_type		calib_type;
-	struct qpnp_vadc_linear_graph	adc_graph[2];
+	struct qpnp_vadc_linear_graph	adc_graph[ADC_HC_CAL_SEL_NONE];
 };
 
 /**
@@ -1243,6 +1243,10 @@ struct qpnp_adc_drv {
  * @fast_avg_setup - Ability to provide single result from the ADC
  *			that is an average of multiple measurements.
  * @trigger_channel - HW trigger channel for conversion sequencer.
+ * @calib_type - Used to store the calibration type for the channel
+ *		 absolute/ratiometric.
+ * @cal_val - Used to determine if fresh calibration value or timer
+ *	      updated calibration value is to be used.
  * @chan_prop - Represent the channel properties of the ADC.
  */
 struct qpnp_adc_amux_properties {
@@ -1252,6 +1256,8 @@ struct qpnp_adc_amux_properties {
 	uint32_t				hw_settle_time;
 	uint32_t				fast_avg_setup;
 	enum qpnp_vadc_trigger			trigger_channel;
+	enum qpnp_adc_calib_type		calib_type;
+	enum qpnp_adc_cal_val			cal_val;
 	struct qpnp_vadc_chan_properties	chan_prop[0];
 };
 
@@ -1683,19 +1689,25 @@ int32_t qpnp_adc_qrd_skut1_btm_scaler(struct qpnp_vadc_chip *dev,
  *		and convert given temperature to voltage on supported
  *		thermistor channels using 100k pull-up.
  * @dev:	Structure device for qpnp vadc
+ * @adc_prop:	adc properties of the qpnp adc such as bit resolution,
+ *		reference voltage.
  * @param:	The input temperature values.
  */
 int32_t qpnp_adc_tm_scale_therm_voltage_pu2(struct qpnp_vadc_chip *dev,
+		const struct qpnp_adc_properties *adc_properties,
 				struct qpnp_adc_tm_config *param);
 /**
  * qpnp_adc_tm_scale_therm_voltage_pu2() - Performs reverse calibration
  *		and converts the given ADC code to temperature for
  *		thermistor channels using 100k pull-up.
  * @dev:	Structure device for qpnp vadc
+ * @adc_prop:	adc properties of the qpnp adc such as bit resolution,
+ *		reference voltage.
  * @reg:	The input ADC code.
  * @result:	The physical measurement temperature on the thermistor.
  */
 int32_t qpnp_adc_tm_scale_voltage_therm_pu2(struct qpnp_vadc_chip *dev,
+			const struct qpnp_adc_properties *adc_prop,
 				uint32_t reg, int64_t *result);
 /**
  * qpnp_adc_usb_scaler() - Performs reverse calibration on the low/high
@@ -2017,11 +2029,13 @@ static inline int32_t qpnp_adc_scale_millidegc_pmic_voltage_thr(
 { return -ENXIO; }
 static inline int32_t qpnp_adc_tm_scale_therm_voltage_pu2(
 				struct qpnp_vadc_chip *dev,
+			const struct qpnp_adc_properties *adc_properties,
 				struct qpnp_adc_tm_config *param)
 { return -ENXIO; }
 static inline int32_t qpnp_adc_tm_scale_voltage_therm_pu2(
 				struct qpnp_vadc_chip *dev,
-				uint32_t reg, int64_t *result)
+			const struct qpnp_adc_properties *adc_prop,
+			uint32_t reg, int64_t *result)
 { return -ENXIO; }
 static inline int32_t qpnp_adc_smb_btm_rscaler(struct qpnp_vadc_chip *dev,
 		struct qpnp_adc_tm_btm_param *param,
diff --git a/include/linux/rndis_ipa.h b/include/linux/rndis_ipa.h
index c9e389ddbf2b..9dcb8c30901b 100644
--- a/include/linux/rndis_ipa.h
+++ b/include/linux/rndis_ipa.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014, 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
@@ -75,7 +75,7 @@ void rndis_ipa_cleanup(void *private);
 
 static inline int rndis_ipa_init(struct ipa_usb_init_params *params)
 {
-	return 0;
+	return -ENOMEM;
 }
 
 static inline int rndis_ipa_pipe_connect_notify(u32 usb_to_ipa_hdl,
@@ -85,12 +85,12 @@ static inline int rndis_ipa_pipe_connect_notify(u32 usb_to_ipa_hdl,
 			u32 max_xfer_size_bytes_to_host,
 			void *private)
 {
-	return 0;
+	return -ENOMEM;
 }
 
 static inline int rndis_ipa_pipe_disconnect_notify(void *private)
 {
-	return 0;
+	return -ENOMEM;
 }
 
 static inline void rndis_ipa_cleanup(void *private)
diff --git a/include/linux/soundwire/soundwire.h b/include/linux/soundwire/soundwire.h
index f19e871d6ac2..4b957245209e 100755
--- a/include/linux/soundwire/soundwire.h
+++ b/include/linux/soundwire/soundwire.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-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
@@ -151,6 +151,7 @@ struct swr_master {
 			  const void *buf, size_t len);
 	int (*get_logical_dev_num)(struct swr_master *mstr, u64 dev_id,
 				u8 *dev_num);
+	void (*slvdev_datapath_control)(struct swr_master *mstr, bool enable);
 };
 
 static inline struct swr_master *to_swr_master(struct device *dev)
@@ -304,4 +305,6 @@ extern int swr_device_down(struct swr_device *swr_dev);
 
 extern int swr_reset_device(struct swr_device *swr_dev);
 
+extern int swr_slvdev_datapath_control(struct swr_device *swr_dev, u8 dev_num,
+				       bool enable);
 #endif /* _LINUX_SOUNDWIRE_H */
diff --git a/include/soc/qcom/clock-local2.h b/include/soc/qcom/clock-local2.h
index 81da257fbbbe..7f785cf4d3a2 100644
--- a/include/soc/qcom/clock-local2.h
+++ b/include/soc/qcom/clock-local2.h
@@ -129,6 +129,23 @@ static inline struct branch_clk *to_branch_clk(struct clk *clk)
 }
 
 /**
+ * struct hw_ctl_clk - Clock structure to enable/disable dynamic clock gating
+ * @c: clk
+ * @cbcr_reg: branch control register
+ * @base: pointer to base address of ioremapped registers.
+ */
+struct hw_ctl_clk {
+	struct clk c;
+	u32 cbcr_reg;
+	void __iomem *const *base;
+};
+
+static inline struct hw_ctl_clk *to_hw_ctl_clk(struct clk *clk)
+{
+	return container_of(clk, struct hw_ctl_clk, c);
+}
+
+/**
  * struct local_vote_clk - Voteable branch clock
  * @c: clk
  * @cbcr_reg: branch control register
@@ -234,6 +251,7 @@ extern struct clk_ops clk_ops_empty;
 extern struct clk_ops clk_ops_rcg;
 extern struct clk_ops clk_ops_rcg_mnd;
 extern struct clk_ops clk_ops_branch;
+extern struct clk_ops clk_ops_branch_hw_ctl;
 extern struct clk_ops clk_ops_vote;
 extern struct clk_ops clk_ops_rcg_hdmi;
 extern struct clk_ops clk_ops_rcg_edp;
diff --git a/include/sound/apr_audio-v2.h b/include/sound/apr_audio-v2.h
index 8fe68b8b8f92..db66cd71aaae 100644
--- a/include/sound/apr_audio-v2.h
+++ b/include/sound/apr_audio-v2.h
@@ -792,7 +792,11 @@ struct adm_cmd_connect_afe_port_v5 {
 #define SLIMBUS_5_TX		0x400b
 #define SLIMBUS_6_RX		0x400c
 #define SLIMBUS_6_TX		0x400d
-#define SLIMBUS_PORT_LAST	SLIMBUS_6_TX
+#define SLIMBUS_7_RX		0x400e
+#define SLIMBUS_7_TX		0x400f
+#define SLIMBUS_8_RX		0x4010
+#define SLIMBUS_8_TX		0x4011
+#define SLIMBUS_PORT_LAST	SLIMBUS_8_TX
 #define INT_BT_SCO_RX 0x3000
 #define INT_BT_SCO_TX 0x3001
 #define INT_BT_A2DP_RX 0x3002
@@ -941,6 +945,14 @@ struct adm_cmd_connect_afe_port_v5 {
 #define AFE_PORT_ID_SLIMBUS_MULTI_CHAN_6_RX      0x400c
 /* SLIMbus Tx port on channel 6. */
 #define AFE_PORT_ID_SLIMBUS_MULTI_CHAN_6_TX      0x400d
+/* SLIMbus Rx port on channel 7. */
+#define AFE_PORT_ID_SLIMBUS_MULTI_CHAN_7_RX      0x400e
+/* SLIMbus Tx port on channel 7. */
+#define AFE_PORT_ID_SLIMBUS_MULTI_CHAN_7_TX      0x400f
+/* SLIMbus Rx port on channel 8. */
+#define AFE_PORT_ID_SLIMBUS_MULTI_CHAN_8_RX      0x4010
+/* SLIMbus Tx port on channel 8. */
+#define AFE_PORT_ID_SLIMBUS_MULTI_CHAN_8_TX      0x4011
 
 /* Generic pseudoport 1. */
 #define AFE_PORT_ID_PSEUDOPORT_01      0x8001
diff --git a/include/sound/msm-audio-effects-q6-v2.h b/include/sound/msm-audio-effects-q6-v2.h
index cbdea328d46c..6bc2338bcf55 100644
--- a/include/sound/msm-audio-effects-q6-v2.h
+++ b/include/sound/msm-audio-effects-q6-v2.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
@@ -16,6 +16,8 @@
 
 #include <sound/audio_effects.h>
 
+#define MAX_PP_PARAMS_SZ   128
+
 bool msm_audio_effects_is_effmodule_supp_in_top(int effect_module,
 						int topology);
 
diff --git a/include/sound/q6afe-v2.h b/include/sound/q6afe-v2.h
index 55918afa0ea3..d30be944dc8c 100644
--- a/include/sound/q6afe-v2.h
+++ b/include/sound/q6afe-v2.h
@@ -108,7 +108,7 @@ enum {
 	IDX_AFE_PORT_ID_QUINARY_MI2S_RX,
 	IDX_AFE_PORT_ID_QUINARY_MI2S_TX,
 	IDX_AFE_PORT_ID_SENARY_MI2S_TX,
-	/* IDX 54-> 118 */
+	/* IDX 54->117 */
 	IDX_AFE_PORT_ID_PRIMARY_TDM_RX_0,
 	IDX_AFE_PORT_ID_PRIMARY_TDM_TX_0,
 	IDX_AFE_PORT_ID_PRIMARY_TDM_RX_1,
@@ -173,6 +173,11 @@ enum {
 	IDX_AFE_PORT_ID_QUATERNARY_TDM_TX_6,
 	IDX_AFE_PORT_ID_QUATERNARY_TDM_RX_7,
 	IDX_AFE_PORT_ID_QUATERNARY_TDM_TX_7,
+	/* IDX 118->122 */
+	IDX_SLIMBUS_7_RX,
+	IDX_SLIMBUS_7_TX,
+	IDX_SLIMBUS_8_RX,
+	IDX_SLIMBUS_8_TX,
 	AFE_MAX_PORTS
 };