Promotion of kernel.lnx.4.4-160429.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
973565   Iab40cff01b6e65db51a4b793572714d2059a78ad   msm: kgsl: Explicitly set ISENSE clock rate for A540.
1004885   I4032b87628e55c304b72bf85c6fe54aa6ce421c1   ARM: dts: msm: Add MSMHAMSTER specific gfx_stub regulato
999530   Ib9eb162544eb4f7271912896c2567e574bd75157   defconfig: arm64: msm: enable service notifier and locat
1004885   Ic995c37ae819ce16668374cecf28fa98e6cf3180   clk: msm: clock: Support multimedia clocks on MSMHAMSTER
1008341   I7a8c28602d6c66b876b1e413791850bcaefdea98   ASoC: wsa881x: Remove support for wsa881x 1.x chip revis
1004885   I4c51aced5eb2c50759c432873ebcd75b19e1823b   ARM: dts: msm: Enable the GCC clock driver on MSMHAMSTER
1006743   I52c36765837cc873877b9398371ffd840d485a81   mm/debug_pagealloc: ask users for default setting of deb
1009230   I567ff2f25bea95481c6d0dbf7c42932ea42419cd   defconfig: msm: Add MSMHAMSTER in defconfig
1004885   If96d8e7e0cd97cf45c48c6c39236d42659e25ea2   clk: msm: clock: Support graphics clocks on MSMHAMSTER
1009284   I3962fd0cbc278c403584e767611f11d841e14d4e   msm: mdss: update header file with DP audio APIs
1008594   I12a8791afeadf36cdf0f298eccc40a35b1ee1d86   defconfig: msmcortex: Remove the scm-xpu driver configur
964814   I6c64debd0c9b43ea5ebf55a58f1f4b06cdc9bd4e   bluetooth: Add slimbus driver for WCN3990
1004664   I3357d504b624b0af2f0710ee237ec13d4460c6bc   msm: camera: Avoid uninitialized variables and add null
1008030   I5c220e4a6225a34b686cbbfdccd0a2329143af86   ARM: dts: msm: Enable blsp1_uart3_hs for msmcobalt
1006741   I7b992495fd98b4fdd08ea4b9a933b580d86a0a7d   defconfig: msmcortex: Enable various debug features
964814   Icc2d037f4312cee62e51ae2ea5c94c8384fa7a79   defconfig: enable slimbus feature for msmcobalt
1004885   I58bb1cbf7e7664617510f908dfc2136227453d65   ARM: dts: msm: Enable the MMSS clock driver on MSMHAMSTE
1004941 CRs Fixed   Iead32e33e13b302baf541fa23e47a2f44846b0ff   ARM: dts: msm: enable haptic on Cobalt CDP and MTP
1007204   I665b15f6b5aca7d63e9ced29ec94b09524ae91be   dwc3: Enable and disable core IRQ from dwc3 suspend/resu
1009230   I4370d561af7a34494accf00b4098ffa13c60410b   ARM: dts: msm: Add initial device tree files for MSMHAMS
999124   I61ec085778fe43b87de18a84829ea3f5280c451c   usb: dwc3: Request dwc3 irq in driver probe
1004885   If77ad3d662fbba145374abe38ea14a1a6e540fee   clk: msm: clock: Support peripheral clocks on MSMHAMSTER
1006857   Ib4137780625fd35968aa920abde973b007754682   ARM: dts: msm: Define SDC2 tlmm pins for msmcobalt
1004222   I519530cb9c7008aacbad1319f9159887f599dc9b   drivers: GICv3: Add isb() before mb() per GICv3 requirem
1004396   I285e0ba20c0a51c17152ae0f01e80c76ecfc8d16   defconfig: Enable Synaptics touchscreen
1007250   I5691c34376f54845cbd288bb824d67fb1b8e4bbc   clk: msm: clock-mmss-cobalt: Update fmaxes for some came
1008026   I26887d1baab9e9dd45c98442fedd5c919dbd7309   ARM: dts: msm: Fix BT LDOs level for msmcobalt
1004885   Ic1e8f73cdfde1f20dea19d580ee61605890e89b2   ARM: dts: msm: Enable the GPU clock driver on MSMHAMSTER
1004396   Ic4d659776d1e2388554978020f52330bbee818ae   ARM: dts: msm: Add Synaptics regulator voltage and curre

Change-Id: I0e3ed7f8e4703eb5821d57f5d29ec5f71a0aee81
CRs-Fixed: 999124, 999530, 1009284, 973565, 1007204, 1004885, 1004941, CRs, 1006743, 1009230, 1008030, 964814, 1006857, 1007250, 1008594, 1004396, Fixed, 1004222, 1008026, 1008341, 1004664, 1006741

4 files changed, 38 insertions, 22 deletions

diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h
index a63822e56429..829599aaf4de 100644
--- a/include/dt-bindings/clock/msm-clocks-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-cobalt.h
@@ -230,6 +230,7 @@
 #define clk_gcc_ufs_ice_core_clk		0x310b0710
 #define clk_gcc_ufs_phy_aux_clk			0x17acc8fb
 #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
diff --git a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
index befb603e89d8..2c92246827b6 100644
--- a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
@@ -198,6 +198,7 @@
 #define GCC_UFS_AHB_CBCR					0x7500C
 #define GCC_UFS_TX_SYMBOL_0_CBCR				0x75010
 #define GCC_UFS_RX_SYMBOL_0_CBCR				0x75014
+#define GCC_UFS_RX_SYMBOL_1_CBCR				0x7605C
 #define GCC_UFS_UNIPRO_CORE_CBCR				0x76008
 #define GCC_UFS_ICE_CORE_CBCR					0x7600C
 #define GCC_UFS_PHY_AUX_CBCR					0x76040
diff --git a/include/linux/msm_hdmi.h b/include/linux/msm_ext_display.h
index 45b206b86765..eb90b49477cc 100644
--- a/include/linux/msm_hdmi.h
+++ b/include/linux/msm_ext_display.h
@@ -1,6 +1,6 @@
-/* include/linux/msm_hdmi.h
+/* include/linux/msm_ext_display.h
  *
- * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -11,32 +11,32 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#ifndef _MSM_HDMI_H_
-#define _MSM_HDMI_H_
+#ifndef _MSM_EXT_DISPLAY_H_
+#define _MSM_EXT_DISPLAY_H_
 
 #include <linux/device.h>
 #include <linux/platform_device.h>
 
 /*
- * HDMI cable notify handler sturcture.
+ * External display cable notify handler structure.
  * link A link for the linked list
- * status Current status of HDMI cable connection
+ * status Current status of HDMI/DP cable connection
  * hpd_notify Callback function to provide cable status
  */
-struct hdmi_cable_notify {
+struct ext_disp_cable_notify {
 	struct list_head link;
 	int status;
-	void (*hpd_notify) (struct hdmi_cable_notify *h);
+	void (*hpd_notify)(struct ext_disp_cable_notify *h);
 };
 
-struct msm_hdmi_audio_edid_blk {
+struct msm_ext_disp_audio_edid_blk {
 	u8 *audio_data_blk;
 	unsigned int audio_data_blk_size; /* in bytes */
 	u8 *spk_alloc_data_blk;
 	unsigned int spk_alloc_data_blk_size; /* in bytes */
 };
 
-struct msm_hdmi_audio_setup_params {
+struct msm_ext_disp_audio_setup_params {
 	u32 sample_rate_hz;
 	u32 num_of_channels;
 	u32 channel_allocation;
@@ -45,14 +45,24 @@ struct msm_hdmi_audio_setup_params {
 	u32 sample_present;
 };
 
-struct msm_hdmi_audio_codec_ops {
+struct msm_ext_disp_audio_codec_ops {
 	int (*audio_info_setup)(struct platform_device *pdev,
-		struct msm_hdmi_audio_setup_params *params);
-	int (*get_audio_edid_blk) (struct platform_device *pdev,
-		struct msm_hdmi_audio_edid_blk *blk);
-	int (*hdmi_cable_status) (struct platform_device *pdev, u32 vote);
+		struct msm_ext_disp_audio_setup_params *params);
+	int (*get_audio_edid_blk)(struct platform_device *pdev,
+		struct msm_ext_disp_audio_edid_blk *blk);
+	int (*cable_status)(struct platform_device *pdev, u32 vote);
 };
 
+#ifdef CONFIG_FB_MSM_MDSS_DP_PANEL
+int msm_dp_register_audio_codec(struct platform_device *pdev,
+	struct msm_ext_disp_audio_codec_ops *ops);
+
+#else
+static inline int msm_dp_register_audio_codec(struct platform_device *pdev,
+		struct msm_ext_disp_audio_codec_ops *ops) {
+	return 0;
+}
+#endif /* CONFIG_FB_MSM_MDSS_DP_PANEL */
 #ifdef CONFIG_FB_MSM_MDSS_HDMI_PANEL
 /*
  * Register for HDMI cable connect or disconnect notification.
@@ -60,7 +70,7 @@ struct msm_hdmi_audio_codec_ops {
  * @return negative value as error otherwise current status of cable
  */
 int register_hdmi_cable_notification(
-		struct hdmi_cable_notify *handler);
+		struct ext_disp_cable_notify *handler);
 
 /*
  * Un-register for HDMI cable connect or disconnect notification.
@@ -68,26 +78,26 @@ int register_hdmi_cable_notification(
  * @return negative value as error
  */
 int unregister_hdmi_cable_notification(
-		struct hdmi_cable_notify *handler);
+		struct ext_disp_cable_notify *handler);
 
 int msm_hdmi_register_audio_codec(struct platform_device *pdev,
-	struct msm_hdmi_audio_codec_ops *ops);
+	struct msm_ext_disp_audio_codec_ops *ops);
 
 #else
 static inline int register_hdmi_cable_notification(
-		struct hdmi_cable_notify *handler) {
+		struct ext_disp_cable_notify *handler) {
 	return 0;
 }
 
 static inline int unregister_hdmi_cable_notification(
-		struct hdmi_cable_notify *handler) {
+		struct ext_disp_cable_notify *handler) {
 	return 0;
 }
 
 static inline int msm_hdmi_register_audio_codec(struct platform_device *pdev,
-		struct msm_hdmi_audio_codec_ops *ops) {
+		struct msm_ext_disp_audio_codec_ops *ops) {
 	return 0;
 }
 #endif /* CONFIG_FB_MSM_MDSS_HDMI_PANEL */
 
-#endif /*_MSM_HDMI_H_*/
+#endif /*_MSM_EXT_DISPLAY_H_*/
diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h
index a836481a37c9..a39e42ce4593 100644
--- a/include/soc/qcom/socinfo.h
+++ b/include/soc/qcom/socinfo.h
@@ -90,6 +90,8 @@
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929")
 #define early_machine_is_msmcobalt()	\
 	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmcobalt")
+#define early_machine_is_msmhamster()	\
+	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmhamster")
 #else
 #define of_board_is_sim()		0
 #define of_board_is_rumi()		0
@@ -124,6 +126,7 @@
 #define early_machine_is_msm8976() 0
 #define early_machine_is_msm8929()	0
 #define early_machine_is_msmcobalt()	0
+#define early_machine_is_msmhamster()	0
 #endif
 
 #define PLATFORM_SUBTYPE_MDM	1
@@ -181,6 +184,7 @@ enum msm_cpu {
 	MSM_CPU_8976,
 	MSM_CPU_8929,
 	MSM_CPU_COBALT,
+	MSM_CPU_HAMSTER,
 };
 
 struct msm_soc_info {