Promotion of kernel.lnx.4.4-160411.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
978318   I933ae498a243cc6d5a38e8553043b30425683ffe   ARM: dts: msm: Add camera sensor module nodes for msmcob
986619   I55723cb5a1d49672f243d6911889caa59ec0ee9f   ARM: dts: msm: replace PM8005 S1 stub regulator device o
1000197   I521519c8abe8eed6924e2fbe3e1a026126582b77   Merge branch 'mdss-final-replay' into msm-4.4
986130   I0f6181d18268f7a2f615155525fbed0f0fe7572a   msm_11ad: add rfclk3 clock handling
1000689   I2030a354493845b63cf92d35ca4eaadef38cfb79   ASoC: msm: qdsp6v2: use token for tracking no wait cmd
1001207   I973d7fb966cb9f6f9497510df5de000d4f8ffcba   edac: device: Use poll_msec from registered edac device
1001183   I6fe3301673eaba9b8b6fa6c4ad8706fa5e979dd0   ARM: dts: msm: Add documentation files for camera driver
1000848   Ica34a3a8b514ca4eebc2fb8081db2b167471cd9b   ARM: dts: msm: Add more clocks to mmss_smmu for cobalt
986619   Iad561ef5bab93f1e82879364639b4a5472e65902   regulator: add documentation snapshot for mem-acc-regula
1001350   Iab5a2dadfec45efb08b9c45f956e9f102d2d2c55   regulator: cprh-kbss-regulator: fix interpolation for hi
986619   Idd5f5380f911b5b5d402b7c19999ce2e300d660d   ARM: dts: msm: add VDD_GFX CPR controller device for msm
999041   I8b1b665e027e925d607fda078cc453a5406f85ea   msm: mdss: Fix AD configuration for single DSI case
996252   Ic3ed8affa2c5bc8fd9b403614f692ab01e1a307a   net: ipv4: Fix type casting to resolve compilation error
1000689   Ie704e34338201ecec191b2031d20552691aed3ea   ASoC: msm: qdsp6v2: use session id for token value
1000754   Iaf5a7a346a7d6ec90edd2e8f46bfa1af7bf6d3d0   ARM: dts: msm: disable UFS LPM modes for msmcobalt cdp/m
1001355   I0cdcd6519338043e40acf9357f39a61ff6f43604   regulator: cprh-kbss-regulator: move controller type ini
986619   I408854a93e820c168551bcfec7d4f87cdbe5d638   regulator: cpr3-mmss-regulator: add support for msmcobal
1001373   Ib3f0cd293e7e5d09f119c226acdca64c87ca61bd   ARM: dts: msm: add SPS node for msmcobalt
996252   I414b551e28a950e4b601f31bb4bfa2f1200d1713   kernel: sched: Fix compilation issues for Usermode Linux
1001346   I65bebcfd8f4785bce9f65243987c05444aab14ee   regulator: cprh-kbss-regulator: use APM hysteresis for v
1000058   I7bd98ad43d0eef1c77ba29102e76efbca282e7c6   defconfig: arm64: msm: Enable diag config flag
1000784   I54d9e9bf1ecfa0d882574dca7ed3bb7cd53b1ef6   defconfig: msmcortex: Disable DBE_IRQ_ONLY for edac driv
1001346   Ida87a70395e8bfd1506166cfa02f5b48b1132269   ARM: dts: msm: Update APM threshold and hysteresis volta
1001212   I37cf5b22f263448eaed5fa039a5d32c707db5d29   Revert "soc: qcom: msm_smd: Use correct IO Read/Write"
994739   Ia55c0c59ffad586636a88f42de9fa68656abfe49   ARM: dts: msm: Add ufs and sdhc device nodes for msmcoba
1001353   Ida2a9ba842038ec2567344f1544e5b4f73794215   ARM: dts: msm: update VDD_APC CPR floor to ceiling range
982931   Ibfcbeb2df9857fecab4d42f0725d70d2a2fa4b98   wil6210: basic PBSS/PCP support
986619   If2559c619f51bd5a34b7845818ba4c4f8645a975   ARM: dts: msm: add VDD_GFX MEM-ACC regulator device for
981975   I5e960ac0553b195e7a69ef596b5fbdcff2064786   ARM: dts: msm: Update memory map for msmcobalt
994739   Id545c5b8f567e7ccdab1c07af9637848366b49a5   ARM: dts: msm: Update ufs clks and regulators for msmcob
986619   Ic6536cb90da928ea82d4575922bdf3cb153e5a27   ARM: dts: msm: use VDD_GFX CPR regulator for GPU clock o
1000754   I4dae3d2471bf3a179e810b5d5520eb26f45e26ba   phy: qcom-ufs: update pll min/max voltage
986619   Id27bf066a014c0a39f47febff2603873050125d9   regulator: qpnp-regulator: add support for FTS426 type r
986619   I5cd316784f1339975a973e63c962fae6cb9db852   platform: qpnp-revid: add support for PM8005
978296   I736d2b90730ec10f9dff21944c4ad50e4d87da5c   soc: qcom: glink: Use tasklet/kworker for TX and RX path
1001350   I8b1baad474a76553ac4094c09fc01b1ea0a4646a   ARM: dts: msm: enable VDD_APC CPR interpolation for msmc
992968   Ie4bd19b0603e856107151972b626c70f9d04a624   ARM: dts: msm: add ion cma heaps for msmcobalt
1001212   I89d9dd8b4cb720f8f968df2a35cbb52b4d09b589   Revert "soc: qcom: glink_smem_native_xprt: Use correct I
981832   I8b7a807c20fd6ff2636943e779597d20459d2d88   msm: sensor: Fix potential NULL ptr dereference
978318   I7295aa6f23b01304c65ff8de08ac115dc53b9803   ARM: dts: msm: Add documentation changes for camera driv
986619   Id16ad7940e96cc9d5a3127551c8a92b05cfbb181   clk: msm: clock: Register graphics clocks in separate pr
986619   I6620cf1fd5ec4181b7ce79bc97039af954dc324e   ARM: dts: msm: add PM8005 PMIC peripheral devices for ms
982026   I300b01cc0f130e797734bfb576f2bfedf1075614   soc: qcom: service-locator: add enable module parameter

Change-Id: I135679df6b321dbd701550e6e0c249097e0b466a
CRs-Fixed: 986130, 992968, 1000754, 981832, 981975, 1001350, 1001353, 1001373, 1001212, 999041, 986619, 978296, 1000197, 996252, 1000848, 1000689, 978318, 982931, 1000784, 1001346, 1001183, 1001207, 1000058, 994739, 982026, 1001355

6 files changed, 23 insertions, 7 deletions

diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h
index 48d41bc9ef30..8fb7e73441bc 100644
--- a/include/dt-bindings/clock/msm-clocks-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-cobalt.h
@@ -97,6 +97,7 @@
 #define clk_debug_rpm_clk			0x8e2b07ca
 #define clk_debug_cpu_clk			0x0e696b2b
 #define clk_gpu_gcc_debug_clk			0x3eb88190
+#define clk_gfx_gcc_debug_clk			0xa3a64fec
 #define clk_gpll0				0x1ebe3bc4
 #define clk_gpll0_out_main			0xe9374de7
 #define clk_gpll0_ao				0xa1368304
@@ -457,6 +458,7 @@
 #define clk_gpu_pll1_postdiv_clk		0xdf546700
 #define clk_gpucc_mx_clk			0x1edbb879
 #define clk_gpucc_gcc_dbg_clk			0x9ae8cd3c
+#define clk_gfxcc_dbg_clk			0x3ed47625
 
 /* CPU clocks */
 #define clk_pwrcl_clk				0xc554130e
diff --git a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
index d2dbf5ffa44c..22bafd3ee428 100644
--- a/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-hwio-cobalt.h
@@ -242,6 +242,8 @@
 #define GPUCC_GFX3D_ISENSE_CBCR					0x01124
 #define GPUCC_CXO_CBCR						0x01020
 #define GPUCC_RBCPR_CBCR					0x01054
+#define GPU_GX_BCR						0x01090
+#define GPUCC_GX_DOMAIN_MISC					0x00130
 #define GPUCC_DEBUG_CLK_CTL					0x00120
 
 #define MMSS_PLL_VOTE_APCS					0x001E0
diff --git a/include/linux/qpnp/qpnp-revid.h b/include/linux/qpnp/qpnp-revid.h
index 4998d93eb094..9e50fe48612f 100644
--- a/include/linux/qpnp/qpnp-revid.h
+++ b/include/linux/qpnp/qpnp-revid.h
@@ -1,4 +1,4 @@
-/* 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
@@ -177,6 +177,9 @@
 /* PMI8998 */
 #define PMI8998_SUBTYPE		0x15
 
+/* PM8005 */
+#define PM8005_SUBTYPE		0x18
+
 /* PM8937 */
 #define PM8937_SUBTYPE		0x19
 
diff --git a/include/sound/q6asm-v2.h b/include/sound/q6asm-v2.h
index 1a0471dac0b3..91b7ed16ef13 100644
--- a/include/sound/q6asm-v2.h
+++ b/include/sound/q6asm-v2.h
@@ -17,7 +17,6 @@
 #include <sound/apr_audio-v2.h>
 #include <linux/list.h>
 #include <linux/msm_ion.h>
-#include <linux/spinlock.h>
 
 #define IN                      0x000
 #define OUT                     0x001
@@ -87,8 +86,9 @@
 #define SOFT_PAUSE_ENABLE	1
 #define SOFT_PAUSE_DISABLE	0
 
-#define SESSION_MAX		0x08
-#define ASM_CONTROL_SESSION	0x0F
+#define ASM_ACTIVE_STREAMS_ALLOWED	0x8
+/* Control session is used for mapping calibration memory */
+#define ASM_CONTROL_SESSION	(ASM_ACTIVE_STREAMS_ALLOWED + 1)
 
 #define ASM_SHIFT_GAPLESS_MODE_FLAG	31
 #define ASM_SHIFT_LAST_BUFFER_FLAG	30
@@ -174,8 +174,6 @@ struct audio_client {
 	/* Relative or absolute TS */
 	atomic_t	       time_flag;
 	atomic_t	       nowait_cmd_cnt;
-	struct list_head       no_wait_que;
-	spinlock_t             no_wait_que_spinlock;
 	atomic_t               mem_state;
 	void		       *priv;
 	uint32_t               io_mode;
@@ -489,4 +487,8 @@ int q6asm_send_mtmx_strtr_window(struct audio_client *ac,
 /* Retrieve the current DSP path delay */
 int q6asm_get_path_delay(struct audio_client *ac);
 
+/* Helper functions to retrieve data from token */
+uint8_t q6asm_get_buf_index_from_token(uint32_t token);
+uint8_t q6asm_get_stream_id_from_token(uint32_t token);
+
 #endif /* __Q6_ASM_H__ */
diff --git a/include/uapi/linux/msm_mdp.h b/include/uapi/linux/msm_mdp.h
index 346081003969..b4eba416cbc2 100644
--- a/include/uapi/linux/msm_mdp.h
+++ b/include/uapi/linux/msm_mdp.h
@@ -344,7 +344,7 @@ struct mdp_csc {
  * to include
  */
 
-#define MDP_BLIT_REQ_VERSION 2
+#define MDP_BLIT_REQ_VERSION 3
 
 struct color {
 	uint32_t r;
@@ -364,6 +364,7 @@ struct mdp_blit_req {
 	uint32_t flags;
 	int sharpening_strength;  /* -127 <--> 127, default 64 */
 	uint8_t color_space;
+	uint32_t fps;
 };
 
 struct mdp_blit_req_list {
diff --git a/include/video/msm_dba.h b/include/video/msm_dba.h
index 16f9052fc2ce..3d20fd8d65eb 100644
--- a/include/video/msm_dba.h
+++ b/include/video/msm_dba.h
@@ -466,6 +466,10 @@ struct msm_dba_video_cfg {
  * @dump_debug_info: dumps debug information to dmesg.
  * @check_hpd: Check if cable is connected or not. if cable is connected we
  *		send notification to display framework.
+ * @set_audio_block: This function will populate the raw audio speaker block
+ *		     data along with size of each block in bridgechip buffer.
+ * @get_audio_block: This function will return the raw audio speaker block
+ *		     along with size of each block.
  *
  * The msm_dba_ops structure represents a set of operations that can be
  * supported by each bridge chip. Depending on the functionality supported by a
@@ -564,6 +568,8 @@ struct msm_dba_ops {
 	int (*force_reset)(void *client, u32 flags);
 	int (*dump_debug_info)(void *client, u32 flags);
 	int (*check_hpd)(void *client, u32 flags);
+	void (*set_audio_block)(void *client, u32 size, void *buf);
+	void (*get_audio_block)(void *client, u32 size, void *buf);
 };
 
 /**