Promotion of kernel.lnx.4.4-160711.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1024170   Ie0cfab09192ca6b09ec4fe171aaf544e3fb5f08f   ARM: dts: msm: return unused pIMEM Vault memory for msmc
1037857   I95544aaf607887ae34eace8a9b1f18a1375c5c6d   ARM: dts: msm: add proxy vote for DSI supplies for msmco
1036737   Ie9bb609f9681580d90e5ec35b89e587758c272d4   ARM: dts: msm: enable audio over HDMI for msmcobalt
1028725   I6cdb366499f9589dff9a42491c7ff357e98d65c5   clk: msm: clock-mmss-cobalt: Add display port clock supp
1026885 1037945   I08d85ef462f09003aaa17f6ebc5d27de7083796f   msm: vidc: update the check to ignore extradata plane in
964855   I17fa4f28cc151e3a3ad89d284995a3fa770bec68   leds: qpnp-flash-v2: add callback for max current query
999299   I3e961f4fe1728a32314a3acf7af719374c90d01f   qseecom: make change for unload TA
1032294   Ie8a19341831d4ffaea36898a80c71ab25f5daf3c   msm: sde: Updating linear format definition for v4l2 rot
1037982   I4f8ec495ae02908d1d8cd7e86148a6d4bd38b198   ARM: dts: msm: Add dts entry mpm2-sleep-counter for MSMC
1024370   Ifb303d7266c98eb94c5eb6f806b7c5e1d95236d3   driver: thermal: Configure ARM threshold instead of low
1039863   I980e39b8c072fc2ec35d84b8698c40c770f7f041   ARM: dts: msm: Add initial device tree files for falcon
1024204   I7d999382dcb6223d84424173a1726c250520ad04   ARM: dts: msm: configure default CMA region for msmcobal
1039560   I20bd718c8cb70029c4dd46c52dbece326b90ef80   msm: ipa3: fix the double ipa3_pre_init issue
1038150   I96010edabd04fef0eeb3cbb0b8f1a11d178d99b5   ASoC: msmcobalt: Fix slimbus tx channel configuration
1036737   Ieef8a2658f9730a9268041ac93ea3958489f2eae   msmcobalt: enable audio over HDMI
1032455   I60c60470a649eecd5bacf0b39b20dff58c910897   ARM: dts: msm: Update MPM interrupt mappings for cobalt
1037449   Ie4dd908657573e5110bce65931d5507125da4c40   iommu/iommu-debug:: initialize variables before use
1035411   I597b58b478a35e9c3e3afb1a2ddd20ad87961c1a   msm: sde: Correct rotator irq enable mismatch
1024187   Ic4ec03e4fd545d44118c2225a3f8e26901ca1d81   ARM: dts: msm: Add regulator node to flash-led for pmico
1037797   I52b909dd226494987c79ed106ffdf9892d966ef1   mfd: qcom-i2c-pmic: add option to skip irq control
1034091   I7e127d97cdd22409d4e70788a7cf2013593d3bfe   msmcobalt: Add delay to check ADSP state during SSR
1018761   Idc368aff7090bcb52ae598faae9f95c1ffe1d4cf   arm64: defconfig: msm: enable MODULE_SIG for msm chipset
1026286   Ib975c99b3b87998c357251a37f4862cbbf68697d   wil6210: fix chan check in wil_p2p_listen
1036660   I8ccbbc9ef0795397614ad0644fd1f2b5e31e3780   ARM: dts: msm: create a separate dtsi file for msmcobalt
1037449   I9d173756e277c9006220c02c209309167f179609   iommu/io-pgtable-fast: validate data before use
1024187   I1515fba2fb04c0b4d21828af3cea6d322262ab14   leds: qpnp-flash-v2: add regulator support
950797   I2c9b0ba0837f8fec5c320e3117aa3b2f553db6b2   sound: usb: Add support for usb audio qmi service
982931   Ie1cd3ccf777e84665075bc3b6d9fffa7d897de49   wil6210: add module parameter for alternate interface na
1021009   I31a49465545e4b9a562b66bff7353d91817205f2   ARM: dts: msm: Change camera mount angle for msmcobalt
1026885 1037945   Ifd18d8689351c4a6a22c988d359fb413be19e142   msm: vidc: add ion_handle checking before mapping buffer
1039456   I37d91c4f7e5d98333cf6be3c75168e134ae78060   media: videobuf2: Increase max buffers
1034091   I8863185651fde8d29b5b8d8f183544bf0f215dbe   ASoC: qdsp6v2: Fix apr registration failure in q6core
1023504 1039037   I053587ae85b36ce0b08fdb5918c0f6b9d678dd24   msm: vidc: Remove forced-setting of layer-wise bitrate f
950797   I1abc80652a167cefa667b914b3a80a87326c3d44   sound: usb: Add support to share iova with remote proces
1024187   Ief6a610c82b7f645966c596f543a1d30f7a40dcc   leds: qpnp-flash-v2: add support for strobe configuratio
1035969   I6bab3370caf776de25316da58ca48fcd9fbc4b5e   defconfig: arm64: msm: Disable qtaguid and net activity
1018826   I0ba4d62e3723841c3dfccdca210c80cd220f78f7   ASoC: msm: qdsp6v2: Fix FE id check in routing driver
1034091   I53a219b1ebed5bc3593d500d80d580aac6431ab5   drivers: soc: set apr handle to NULL on glink_open error

Change-Id: I2513c5f512828858c5dd28d56050967f4d788746
CRs-Fixed: 950797, 1035411, 1037857, 1024370, 964855, 1039456, 982931, 1023504, 1026885, 1028725, 1036660, 1035969, 1036737, 1037982, 1021009, 1037449, 1024204, 1038150, 1024187, 1039863, 1034091, 1039560, 1032455, 1018826, 1024170, 1032294, 999299, 1037945, 1026286, 1037797, 1039037, 1018761

5 files changed, 43 insertions, 2 deletions

diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h
index d3cfc622b323..5cdeb01a173b 100644
--- a/include/dt-bindings/clock/msm-clocks-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-cobalt.h
@@ -306,6 +306,11 @@
 #define clk_csi2_clk_src			0x4113589f
 #define clk_csi3_clk_src			0xfd934012
 #define clk_fd_core_clk_src			0xe4799ab7
+#define clk_ext_dp_phy_pll_vco			0x441b576b
+#define clk_ext_dp_phy_pll_link			0xea12644c
+#define clk_dp_link_clk_src			0x370d0626
+#define clk_dp_crypto_clk_src			0xf8faa811
+#define clk_dp_pixel_clk_src			0xf5dfbabf
 #define clk_ext_extpclk_clk_src			0xe5b273af
 #define clk_ext_pclk0_clk_src			0x087c1612
 #define clk_ext_pclk1_clk_src			0x8067c5a3
@@ -405,6 +410,10 @@
 #define clk_mmss_mdss_byte1_intf_clk		0xcf654d8e
 #define clk_mmss_mdss_byte1_intf_div_clk	0xcdf334c5
 #define clk_mmss_mdss_dp_aux_clk		0x23125eb6
+#define clk_mmss_mdss_dp_crypto_clk		0x9a072d4e
+#define clk_mmss_mdss_dp_link_clk		0x8dd302d1
+#define clk_mmss_mdss_dp_link_intf_clk		0x70e386e6
+#define clk_mmss_mdss_dp_pixel_clk		0xb707b765
 #define clk_mmss_mdss_dp_gtc_clk		0xb59c151a
 #define clk_mmss_mdss_esc0_clk			0x5721ff83
 #define clk_mmss_mdss_esc1_clk			0xc3d0376b
diff --git a/include/linux/leds-qpnp-flash-v2.h b/include/linux/leds-qpnp-flash-v2.h
index ae36a163ed21..1ff8781d3837 100644
--- a/include/linux/leds-qpnp-flash-v2.h
+++ b/include/linux/leds-qpnp-flash-v2.h
@@ -16,6 +16,15 @@
 #include <linux/leds.h>
 #include "leds.h"
 
+#define ENABLE_REGULATOR	BIT(0)
+#define QUERY_MAX_CURRENT	BIT(1)
+
+struct flash_regulator_data {
+	struct regulator	*vreg;
+	const char		*reg_name;
+	u32			max_volt_uv;
+};
+
 /*
  * Configurations for each individual LED
  */
@@ -25,6 +34,9 @@ struct flash_node_data {
 	struct pinctrl			*pinctrl;
 	struct pinctrl_state		*gpio_state_active;
 	struct pinctrl_state		*gpio_state_suspend;
+	struct pinctrl_state		*hw_strobe_state_active;
+	struct pinctrl_state		*hw_strobe_state_suspend;
+	int				hw_strobe_gpio;
 	int				ires_ua;
 	int				max_current;
 	int				current_ma;
@@ -34,12 +46,18 @@ struct flash_node_data {
 	u8				ires;
 	u8				hdrm_val;
 	u8				current_reg_val;
+	u8				trigger;
 	bool				led_on;
 };
 
 struct flash_switch_data {
 	struct platform_device		*pdev;
 	struct led_classdev		cdev;
+	struct flash_regulator_data	*reg_data;
+	u8				num_regulators;
+	bool				regulator_on;
 };
 
+int qpnp_flash_led_prepare(struct led_classdev *led_cdev, int options);
+
 #endif
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index 647ebfe5174f..4984d372b04b 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -17,7 +17,7 @@
 #include <linux/poll.h>
 #include <linux/dma-buf.h>
 
-#define VB2_MAX_FRAME	(32)
+#define VB2_MAX_FRAME	(64)
 #define VB2_MAX_PLANES	(8)
 
 enum vb2_memory {
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index c7bb78a0d57b..46b0402a730f 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -70,7 +70,7 @@
  * Common stuff for both V4L1 and V4L2
  * Moved from videodev.h
  */
-#define VIDEO_MAX_FRAME               32
+#define VIDEO_MAX_FRAME               64
 #define VIDEO_MAX_PLANES               8
 
 /*
diff --git a/include/uapi/media/msm_sde_rotator.h b/include/uapi/media/msm_sde_rotator.h
index d771959f2e03..461a171a42c1 100644
--- a/include/uapi/media/msm_sde_rotator.h
+++ b/include/uapi/media/msm_sde_rotator.h
@@ -13,9 +13,23 @@
 #define SDE_PIX_FMT_BGRA_8888		V4L2_PIX_FMT_ARGB32
 #define SDE_PIX_FMT_RGBX_8888		v4l2_fourcc('X', 'B', '2', '4')
 #define SDE_PIX_FMT_BGRX_8888		V4L2_PIX_FMT_XRGB32
+#define SDE_PIX_FMT_XBGR_8888		v4l2_fourcc('R', 'X', '2', '4')
 #define SDE_PIX_FMT_RGBA_5551		v4l2_fourcc('R', 'A', '1', '5')
+#define SDE_PIX_FMT_ARGB_1555		V4L2_PIX_FMT_ARGB555
+#define SDE_PIX_FMT_ABGR_1555		v4l2_fourcc('A', 'B', '1', '5')
+#define SDE_PIX_FMT_BGRA_5551		v4l2_fourcc('B', 'A', '1', '5')
+#define SDE_PIX_FMT_BGRX_5551		v4l2_fourcc('B', 'X', '1', '5')
+#define SDE_PIX_FMT_RGBX_5551		v4l2_fourcc('R', 'X', '1', '5')
+#define SDE_PIX_FMT_XBGR_1555		v4l2_fourcc('X', 'B', '1', '5')
+#define SDE_PIX_FMT_XRGB_1555		V4L2_PIX_FMT_XRGB555
 #define SDE_PIX_FMT_ARGB_4444		V4L2_PIX_FMT_ARGB444
 #define SDE_PIX_FMT_RGBA_4444		v4l2_fourcc('R', 'A', '1', '2')
+#define SDE_PIX_FMT_BGRA_4444		v4l2_fourcc('B', 'A', '1', '2')
+#define SDE_PIX_FMT_ABGR_4444		v4l2_fourcc('A', 'B', '1', '2')
+#define SDE_PIX_FMT_RGBX_4444		v4l2_fourcc('R', 'X', '1', '2')
+#define SDE_PIX_FMT_XRGB_4444		V4L2_PIX_FMT_XRGB444
+#define SDE_PIX_FMT_BGRX_4444		v4l2_fourcc('B', 'X', '1', '2')
+#define SDE_PIX_FMT_XBGR_4444		v4l2_fourcc('X', 'B', '1', '2')
 #define SDE_PIX_FMT_RGB_888		V4L2_PIX_FMT_RGB24
 #define SDE_PIX_FMT_BGR_888		V4L2_PIX_FMT_BGR24
 #define SDE_PIX_FMT_RGB_565		V4L2_PIX_FMT_RGB565