Promotion of kernel.lnx.4.4-161028.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1080392   I05345b8f5d108e59863ee4e37ed75fd32a284ee5   ASoC: wcd-dsp-mgr: fix restart logic when codec comes ba
1081345   I69981b603526575758376695d7a5e9affd389dbe   ARM: dts: msm: add SLPI fw name property for msmcobalt
1024862   I600c646a0c23b654392d8e00a829bfd88b71c38c   msm: mdss: Fix memleak in panel_debug_reg_write
1069060   Icbdb05aeb9211665420a872d3453dbbd24fd347b   msm: ipa: fix ioctl input param validation
1061018   I738eeb141d323ae1a77f352b11525556888a9243   ARM: dts: msm: fix sd card detection for msmcobalt QRD S
1050304   I9c7afdd74122318fc5f7ebd7c0381a4078d1fb01   msm: mdss: edid: fix dtd parsing
1082022   Iad90353f66cf5ad7f83e3fc252d82cec45abce60   platform: qpnp-revid: Add REVID details for PM/PM2FALCON
1077762   I8121d45fedab6197f8466d25674d5b0decd45f1b   ARM: dts: msm: enable esd for nt35597 panels in msmcobal
1080014   Ic5dbac9c2cd31f3193ede7cdc64249f7514e3e98   icnss: Do top level reset when timeout to pull register
1077766   Ie60587aa4a4a48bae70ceac4e053e63fc29f516a   ASoC: msm: Add routes for all TDM modes
1078147   I0aa3443a2fddfa200631b6fe9eb22de10178fe46   icnss: Do not parse VBATT DT entry if VBATT feature is d
1080392   Id9cbda04a4c36070e52919d3a34ebc871ac22a8e   ASoC: wcd934x: Trigger codec DSP subsystem restart
1081806   I42a47e4386ca7a1bbbec428c8d2cbe307634cd1e   ARM: dts: msm: Add support for Modem PIL on msmtriton
1081547   I64f0f5b15cc5d9185e415f0b26e276e111c885ec   usb: dwc3: gadget: Remove dev_WARN_ONCE in dwc3_gadget_e
1082650   Iab7fc8551b628c443ce751026b06c5ff4ebba39a   sched: Fix compilation issue with reset_hmp_stats
1082650   Idb74e9df4fcb55085ac869f5ba273cef4a3eb9eb   sched/fair: Fix compilation issue
1069188   I2939e9fd37e96f37101b93dabd86cfdaaf06907f   ASoC: wcd934x: Add support for audio subsystem restart
1081010   I16e500aa87813cd3a1e18f134ea1ed145b9e1ef8   msm: sde: Fix SDE rotator clock disable sequence
1074914   I94b9091b8349d6388fbe5c29eabe3666c86e5cce   ASoC: msm: Enable Media Format converter for all resampl
1081806   I3e700bdae21b6e18b28cf5982e42e73d7ae953a5   ARM: dts: msm: Add support for Modem PIL on msmfalcon
1077762   I3df0889c1225dcb613910cb90f050a2994f5834d   msm: mdss: fix crash when wrong params are passed on the
1065513   I29b9ea41df467d0092be8005733016843dc26f60   input: touchscreen: replace macros used inside the funct
1082047   I6a678d9133b06dda2de1c6cfe4bbafacc594f299   leds: qpnp-wled: add a secure write API
1076402   If06c421c559277066cf9ffd86e71fe366ab7bf8d   leds: qpnp-flash-v2: fix safety timer configuration
1081279   I1b614cb70aa43087c122ce6c42305491e5f5b34b   clk: qcom: Change clock index for mmssnoc_axi clock for
1081803   Ib0d27c13c0ebdfac629c1469c9a91a0b84d03640   soc: qcom: pil-q6v5: Add support for qdspv62.1.5 reset
1080796   Ife9d6a16e1607b40c71eb1897947bf4645ac9561   USB: dwc3-msm: Disable pipe clock requirement for HS/FS
1025311   I5f9627964d86c51cb8fb0c5c5f7c9f5f2e19b3e7   cfg80211: Add support to configure a beacon data rate
1081430   I2abd67a8ff647165ddedb385e80f8705d73d3100   input: touchscreen: fix compilation errors for Goodix dr
1077525   I012484aa92e8f25ed0ad4f6709a54f40409ab8d2   msm: ipa: Fix the memory leak in error cases
1079971   Ib6bddd5f43b41660304d240db39f4e273ede3af0   input: misc: hbtp_input: Add support for multiple AFE
1082047   I4c99b598d5f484368712eab239f7de70b727c2aa   leds: qpnp-wled: Fix configuration of AVDD TRIM and OVP
1075303   I0552bf8a48c214b89e160fe4df145973f02c2788   ASoC: wcd934x-dsp-cntl: fix memory enable/disable sequen
1079311   I58421ba7f784f7467015a5943aecc2dd0022145a   leds: qpnp-flash-v2: fix ITARGET configuration
1048242   I2ef9f3e122b39682a743334668fcd0aeb085e147   qcom-charger: set optimal buck switching frequency
1080290   I0f48666ac948a9571e249598ae7cc19df9036b1d   qseecom: check buffer size when loading firmware images
1022917   Ib846318dc3d359672314485d386a23fd8621bfda   ARM: dts: msm: Add dmic clock rate on ECPP path for msmc
1072280   I9640112b8945dc603e3af55fc1096bea9f7e6634   ASoC: qdsp6v2: fix potential bug of infinite loop
1082047   If0646f5ae111f75ababc405cbd2f7bcea899360e   leds: qpnp-wled: add support to read pmic revid
1043802   I1d9d7a6b6bd2d3420a28a8c09868143bb9bd3b27   soc: qcom: add support for fingerprint sensor driver
1076516   If68d029c87db2370f07f279aacbc51d139f00aae   msm: mdss: dp: trigger link retraining on link status up
1077773   I99fcbc5c1b36f62ecfa7631f1b51633a7fb08417   ASoC: msmcobalt: Add support for all TDM modes
1080331   Iaec3a17e5eed952ba0abdcffbf321ad942486769   drivers: mfd: wcd934x: Set MBHC registers to volatile
1082440   I287761ce5b13dc139f59270dceac67cc9ae45cff   defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmfalco
1082440   I6028d4a01ddfd8f8589a1de5322c2780d256d5bc   defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmcorte
1024872   I03ce718b0456d437d31d701586965d0aa7443b51   msm: mdss: Correct the format specifiers in sscanf funct
1076227   Ic756deeabeb0eaaf95e5354b565cf20a85fd7cca   msm: mdss: dp: remove programming of maud/naud for audio
1024934   I533e2d6a760ebd52047c521c1a1e85bfc754fce1   msm: mdss: Fix memleak in framebuffer register and remov
1081757   I13156d82f544cd28a1579c23b18182c879c85767   clk: osm: msm: allow WDOG status register to be enabled
1077761   I9cc07edd7d72e7fae8f95b16461aac75c3fa1fc9   ARM: dts: msm: add support for all TDM modes
1024850   I10ea6f2b22d554d02f302f5700f6674d08e4777d   msm: mdss: Check for buffer boundary condition in panel_
1073650   I2836ef5b7f37f627a32a0b4332dc299a60012704   msm: mdss: Avoid adaptive variable refresh during dynami
1081345   I9ecc0cc1b5de5e0bd47c658747463a4498123655   sensors: ssc: add support to read SLPI fw name
1077762   Ia03f76cf13d3787e2e13e27ae0360723fe36d615   ARM: dts: msm: enable esd for jdi qhd cmd mode panel in
1077684   I340f778583bb63d6436c4ef8f51ead77a2871625   msm: mdss: Correct settings when on/off happens in dest-
1022917   I772e05990a796c99c3b6b6f50323d87b5894231b   ASoC: msmcobalt: Fix MCLK routing on msmcobalt for WCD93
1082191   If3d964840362b6147ba7c9e26c4a3f5d20e5a557   clk: msm: clock: Remove controlling some graphics clocks
1051643 1054360   I1b3af2a59dabf67a947a59334883ce0437c9ee6f   ARM: dts: msm: add PCIe PHY sequence for msmcobalt v2

Change-Id: I673d05df7b013787ac73574a972dd7bade7332af
CRs-Fixed: 1076227, 1081757, 1077766, 1077761, 1072280, 1077762, 1022917, 1074914, 1069060, 1051643, 1076516, 1081430, 1080290, 1077525, 1078147, 1081803, 1024862, 1077684, 1048242, 1081806, 1025311, 1081345, 1050304, 1065513, 1081547, 1061018, 1073650, 1082191, 1077773, 1079311, 1082440, 1082650, 1081010, 1080796, 1024872, 1076402, 1054360, 1024934, 1080331, 1079971, 1043802, 1075303, 1024850, 1080392, 1069188, 1082022, 1082047, 1080014, 1081279

6 files changed, 207 insertions, 10 deletions

diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 0bac6947a1cb..d6ff882ad6a7 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -381,6 +381,7 @@ header-y += prctl.h
 header-y += psci.h
 header-y += ptp_clock.h
 header-y += ptrace.h
+header-y += qbt1000.h
 header-y += qcedev.h
 header-y += qcota.h
 header-y += qnx4_fs.h
diff --git a/include/uapi/linux/hbtp_input.h b/include/uapi/linux/hbtp_input.h
index 67692ed8e3b8..9173c2ab72ed 100644
--- a/include/uapi/linux/hbtp_input.h
+++ b/include/uapi/linux/hbtp_input.h
@@ -43,6 +43,17 @@ struct hbtp_input_key {
 	__s32 value;
 };
 
+enum hbtp_afe_signal {
+	HBTP_AFE_SIGNAL_ON_RESUME,
+	HBTP_AFE_SIGNAL_ON_SUSPEND,
+};
+
+enum hbtp_afe_power_ctrl {
+	HBTP_AFE_POWER_ENABLE_SYNC,
+	HBTP_AFE_POWER_ENABLE_SYNC_SIGNAL,
+};
+
+
 /* ioctl */
 #define HBTP_INPUT_IOCTL_BASE	'T'
 #define HBTP_SET_ABSPARAM	_IOW(HBTP_INPUT_IOCTL_BASE, 201, \
@@ -53,6 +64,10 @@ struct hbtp_input_key {
 					enum hbtp_afe_power_cmd)
 #define HBTP_SET_KEYDATA	_IOW(HBTP_INPUT_IOCTL_BASE, 204, \
 					struct hbtp_input_key)
+#define HBTP_SET_SYNCSIGNAL	_IOW(HBTP_INPUT_IOCTL_BASE, 205, \
+					enum hbtp_afe_signal)
+#define HBTP_SET_POWER_CTRL	_IOW(HBTP_INPUT_IOCTL_BASE, 206, \
+					enum hbtp_afe_power_ctrl)
 
 #endif	/* _UAPI_HBTP_INPUT_H */
 
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
index 9cf2394f0bcf..752f5dc040a5 100644
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
@@ -19,14 +19,20 @@
 #ifndef _LINUX_IF_H
 #define _LINUX_IF_H
 
+#include <linux/libc-compat.h>          /* for compatibility with glibc */
 #include <linux/types.h>		/* for "__kernel_caddr_t" et al	*/
 #include <linux/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/compiler.h>		/* for "__user" et al           */
 
+#if __UAPI_DEF_IF_IFNAMSIZ
 #define	IFNAMSIZ	16
+#endif /* __UAPI_DEF_IF_IFNAMSIZ */
 #define	IFALIASZ	256
 #include <linux/hdlc/ioctl.h>
 
+/* For glibc compatibility. An empty enum does not compile. */
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && \
+    __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0
 /**
  * enum net_device_flags - &struct net_device flags
  *
@@ -68,6 +74,8 @@
  * @IFF_ECHO: echo sent packets. Volatile.
  */
 enum net_device_flags {
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS
 	IFF_UP				= 1<<0,  /* sysfs */
 	IFF_BROADCAST			= 1<<1,  /* volatile */
 	IFF_DEBUG			= 1<<2,  /* sysfs */
@@ -84,11 +92,17 @@ enum net_device_flags {
 	IFF_PORTSEL			= 1<<13, /* sysfs */
 	IFF_AUTOMEDIA			= 1<<14, /* sysfs */
 	IFF_DYNAMIC			= 1<<15, /* sysfs */
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
 	IFF_LOWER_UP			= 1<<16, /* volatile */
 	IFF_DORMANT			= 1<<17, /* volatile */
 	IFF_ECHO			= 1<<18, /* volatile */
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
 };
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */
 
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS
 #define IFF_UP				IFF_UP
 #define IFF_BROADCAST			IFF_BROADCAST
 #define IFF_DEBUG			IFF_DEBUG
@@ -105,9 +119,13 @@ enum net_device_flags {
 #define IFF_PORTSEL			IFF_PORTSEL
 #define IFF_AUTOMEDIA			IFF_AUTOMEDIA
 #define IFF_DYNAMIC			IFF_DYNAMIC
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */
+
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
 #define IFF_LOWER_UP			IFF_LOWER_UP
 #define IFF_DORMANT			IFF_DORMANT
 #define IFF_ECHO			IFF_ECHO
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
 
 #define IFF_VOLATILE	(IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
 		IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
@@ -166,6 +184,8 @@ enum {
  *	being very small might be worth keeping for clean configuration.
  */
 
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_IFMAP
 struct ifmap {
 	unsigned long mem_start;
 	unsigned long mem_end;
@@ -175,6 +195,7 @@ struct ifmap {
 	unsigned char port;
 	/* 3 bytes spare */
 };
+#endif /* __UAPI_DEF_IF_IFMAP */
 
 struct if_settings {
 	unsigned int type;	/* Type of physical device or protocol */
@@ -200,6 +221,8 @@ struct if_settings {
  * remainder may be interface specific.
  */
 
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_IFREQ
 struct ifreq {
 #define IFHWADDRLEN	6
 	union
@@ -223,6 +246,7 @@ struct ifreq {
 		struct	if_settings ifru_settings;
 	} ifr_ifru;
 };
+#endif /* __UAPI_DEF_IF_IFREQ */
 
 #define ifr_name	ifr_ifrn.ifrn_name	/* interface name 	*/
 #define ifr_hwaddr	ifr_ifru.ifru_hwaddr	/* MAC address 		*/
@@ -249,6 +273,8 @@ struct ifreq {
  * must know all networks accessible).
  */
 
+/* for compatibility with glibc net/if.h */
+#if __UAPI_DEF_IF_IFCONF
 struct ifconf  {
 	int	ifc_len;			/* size of buffer	*/
 	union {
@@ -256,6 +282,8 @@ struct ifconf  {
 		struct ifreq __user *ifcu_req;
 	} ifc_ifcu;
 };
+#endif /* __UAPI_DEF_IF_IFCONF */
+
 #define	ifc_buf	ifc_ifcu.ifcu_buf		/* buffer address	*/
 #define	ifc_req	ifc_ifcu.ifcu_req		/* array of structures	*/
 
diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
index 7d024ceb075d..d5e38c73377c 100644
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
@@ -51,6 +51,40 @@
 /* We have included glibc headers... */
 #if defined(__GLIBC__)
 
+/* Coordinate with glibc net/if.h header. */
+#if defined(_NET_IF_H)
+
+/* GLIBC headers included first so don't define anything
+ * that would already be defined. */
+
+#define __UAPI_DEF_IF_IFCONF 0
+#define __UAPI_DEF_IF_IFMAP 0
+#define __UAPI_DEF_IF_IFNAMSIZ 0
+#define __UAPI_DEF_IF_IFREQ 0
+/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
+/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
+
+#else /* _NET_IF_H */
+
+/* Linux headers included first, and we must define everything
+ * we need. The expectation is that glibc will check the
+ * __UAPI_DEF_* defines and adjust appropriately. */
+
+#define __UAPI_DEF_IF_IFCONF 1
+#define __UAPI_DEF_IF_IFMAP 1
+#define __UAPI_DEF_IF_IFNAMSIZ 1
+#define __UAPI_DEF_IF_IFREQ 1
+/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
+/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+
+#endif /* _NET_IF_H */
+
 /* Coordinate with glibc netinet/in.h header. */
 #if defined(_NETINET_IN_H)
 
@@ -117,6 +151,16 @@
  * that we need. */
 #else /* !defined(__GLIBC__) */
 
+/* Definitions for if.h */
+#define __UAPI_DEF_IF_IFCONF 1
+#define __UAPI_DEF_IF_IFMAP 1
+#define __UAPI_DEF_IF_IFNAMSIZ 1
+#define __UAPI_DEF_IF_IFREQ 1
+/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
+/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+
 /* Definitions for in.h */
 #define __UAPI_DEF_IN_ADDR		1
 #define __UAPI_DEF_IN_IPPROTO		1
diff --git a/include/uapi/linux/qbt1000.h b/include/uapi/linux/qbt1000.h
new file mode 100644
index 000000000000..8a3be2c634d3
--- /dev/null
+++ b/include/uapi/linux/qbt1000.h
@@ -0,0 +1,99 @@
+#ifndef _UAPI_QBT1000_H_
+#define _UAPI_QBT1000_H_
+
+#define MAX_NAME_SIZE					 32
+
+/*
+* enum qbt1000_commands -
+*      enumeration of command options
+* @QBT1000_LOAD_APP - cmd loads TZ app
+* @QBT1000_UNLOAD_APP - cmd unloads TZ app
+* @QBT1000_SEND_TZCMD - sends cmd to TZ app
+* @QBT1000_SET_FINGER_DETECT_KEY - sets the input key to send on finger detect
+* @QBT1000_CONFIGURE_POWER_KEY - enables/disables sending the power key on
+	finger down events
+*/
+enum qbt1000_commands {
+	QBT1000_LOAD_APP = 100,
+	QBT1000_UNLOAD_APP = 101,
+	QBT1000_SEND_TZCMD = 102,
+	QBT1000_SET_FINGER_DETECT_KEY = 103,
+	QBT1000_CONFIGURE_POWER_KEY = 104
+};
+
+/*
+* enum qbt1000_fw_event -
+*      enumeration of firmware events
+* @FW_EVENT_FINGER_DOWN - finger down detected
+* @FW_EVENT_FINGER_UP - finger up detected
+* @FW_EVENT_INDICATION - an indication IPC from the firmware is pending
+*/
+enum qbt1000_fw_event {
+	FW_EVENT_FINGER_DOWN = 1,
+	FW_EVENT_FINGER_UP = 2,
+	FW_EVENT_CBGE_REQUIRED = 3,
+};
+
+/*
+* struct qbt1000_app -
+*      used to load and unload apps in TZ
+* @app_handle - qseecom handle for clients
+* @name - Name of secure app to load
+* @size - Size of requested buffer of secure app
+* @high_band_width - 1 - for high bandwidth usage
+*                    0 - for normal bandwidth usage
+*/
+struct qbt1000_app {
+	struct qseecom_handle **app_handle;
+	char name[MAX_NAME_SIZE];
+	uint32_t size;
+	uint8_t high_band_width;
+};
+
+/*
+* struct qbt1000_send_tz_cmd -
+*      used to cmds to TZ App
+* @app_handle - qseecom handle for clients
+* @req_buf - Buffer containing request for secure app
+* @req_buf_len - Length of request buffer
+* @rsp_buf - Buffer containing response from secure app
+* @rsp_buf_len - Length of response buffer
+*/
+struct qbt1000_send_tz_cmd {
+	struct qseecom_handle *app_handle;
+	uint8_t *req_buf;
+	uint32_t req_buf_len;
+	uint8_t *rsp_buf;
+	uint32_t rsp_buf_len;
+};
+
+/*
+* struct qbt1000_erie_event -
+*      used to receive events from Erie
+* @buf - Buffer containing event from Erie
+* @buf_len - Length of buffer
+*/
+struct qbt1000_erie_event {
+	uint8_t *buf;
+	uint32_t buf_len;
+};
+
+/*
+* struct qbt1000_set_finger_detect_key -
+*      used to configure the input key which is sent on finger down/up event
+* @key_code - Key code to send on finger down/up. 0 disables sending key events
+*/
+struct qbt1000_set_finger_detect_key {
+	unsigned int key_code;
+};
+
+/*
+* struct qbt1000_configure_power_key -
+*      used to configure whether the power key is sent on finger down
+* @enable - if non-zero, power key is sent on finger down
+*/
+struct qbt1000_configure_power_key {
+	unsigned int enable;
+};
+
+#endif /* _UAPI_QBT1000_H_ */
diff --git a/include/uapi/linux/v4l2-dv-timings.h b/include/uapi/linux/v4l2-dv-timings.h
index c039f1d68a09..086168e18ca8 100644
--- a/include/uapi/linux/v4l2-dv-timings.h
+++ b/include/uapi/linux/v4l2-dv-timings.h
@@ -183,7 +183,8 @@
 
 #define V4L2_DV_BT_CEA_3840X2160P24 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		297000000, 1276, 88, 296, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, \
 		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
@@ -191,14 +192,16 @@
 
 #define V4L2_DV_BT_CEA_3840X2160P25 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		297000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P30 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		297000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, \
 		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
@@ -206,14 +209,16 @@
 
 #define V4L2_DV_BT_CEA_3840X2160P50 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		594000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_3840X2160P60 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(3840, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		594000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, \
 		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
@@ -221,7 +226,8 @@
 
 #define V4L2_DV_BT_CEA_4096X2160P24 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		297000000, 1020, 88, 296, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, \
 		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
@@ -229,14 +235,16 @@
 
 #define V4L2_DV_BT_CEA_4096X2160P25 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		297000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P30 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		297000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, \
 		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
@@ -244,14 +252,16 @@
 
 #define V4L2_DV_BT_CEA_4096X2160P50 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		594000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
 }
 
 #define V4L2_DV_BT_CEA_4096X2160P60 { \
 	.type = V4L2_DV_BT_656_1120, \
-	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, V4L2_DV_HSYNC_POS_POL, \
+	V4L2_INIT_BT_TIMINGS(4096, 2160, 0, \
+		V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
 		594000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
 		V4L2_DV_BT_STD_CEA861, \
 		V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \