Promotion of kernel.lnx.4.4-160903.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1061279   I464579953fabe1bd42ced50f0bbfdfd3cda0a492   icnss: Fix NULL pointer dererference
1037346   I59c0ee5d3c5f206ae09d6b813f1e5c1ce1434cc1   cnss: Use Different Dump Names for QCA PCIe and SDIO tar
1057013   I6337f93c13678c9256dfd46825f9a317cdaa0a1b   msm: ipa3: Fix wrong parameter to xdci release function
1046961   Ic26376bebeba8e7f0dd37ef3bfbbed36c621604b   input: ft5x06_ts: correct the status of the pocket mode
1046961   I531c7fa7db2b7140e5b9c7bb31831d221c734e3e   input: ft5x06_ts: add sysfs to access touch module info
1061765   Ib8ff42a6e05c0065b19e977eb56f6b96a78fcf39   ARM: dts: msm: Update qusb2 phy init sequence for msmcob
1058794   Ia3ab2781c93d1cfe7427e2b1c2644f6628f6465f   cnss: Reset QCA Card during WLAN SubSystem Recovery
1061915   Ibe4dd9d951a9615ae100e68dc15b3614e9834848   USB: f_accessory: set manufacturer and model string to d
1059620   Ifb0f9928fa1d948351e6fc1ad925a070a7f50a96   msm: sde: Fix SMMU fault in SDE rotator for secure playb
1060058   I97b11dc21882f08327d7d056ce1bf1c34b3c3946   ARM: dts: msm: add 2 lane support for msmcobalt ufs phy
1051911   I08eadac9585f85c2c2cec83cd382bed109e143ed   defconfig: msmcortex: enable QCOM_TADC driver
747810   I2b1ff8bd7131969ce9e25f8291d83a6280b3ba7f   nf: xt_qtaguid: fix handling for cases where tunnels are
1061279   Iad1c9abbdbaea21d4c55d64a6c120d3bcf0df1eb   icnss: Prevent power collapse during driver probe/remove
1060158   I5818d2731b53af37d796d421c5ae9a4b7fa52405   diag: Do not open glink channel twice
1058351   I9a892ca7ffac903338c7f4f9ed5923b7b663a6a8   defconfig: msm: enable common log for msmcobalt
1055875   I31909c45a4fec921da322658ec84d387d0f182ac   msm: mdss: increase mdp hw recovery timeout
1060725   Id19518a12fe8a0acffd725b25dbcb0240bdbf446   icnss: Fix logic to wait for WCSS out of retention
1046581   I63e40a5dc33e783951c0e946e85c7ca4a970cab4   msm: sensor: Add support for querying flash max current
1058912   I40ba5c9fe8bf96f81fc5256042b4a70731520e1d   msm: camera: isp: Use single stream for dual vfe
1014464   I3d1345118df151f8521d5ad230311a56105b5f4a   msm: camera: secure camera support
1046961   I6d46b35938b7420072f9245ffa27bb59f28d5e03   input: ft5x06_ts: remove proximity sensor support
1017614   I01065135889697dd8512ced09b8e1939e0fb645b   ipv4/GRO: Make GRO conform to RFC 6864
1046961   Ic228ac8b6dec0bc3e1aaff890dc5b1b7c024bdfc   input: ft5x06_ts: fix compiling error in FT CTP driver
1060633   Ie93f874b90b5aed0a66e97186e4f1d69a1275c8b   qcom-charger: smb2: configure stat pin for parallel char
1058794   I0257698d9d168d7c889436a05693061cafe5ea7c   net: cnss: Release QCA chip resources when Wi-Fi is turn
1004073   I760e2999ec56c9aa0c44ac7b062ee1755192299f   cfg80211: Define macro to indicate prev_bssid connect su
1056610   I8c7d27a062b90a3f200904f0ba20fbdb0bb32d70   msm: mdss: fix adaptive variable refresh and dynamic fps
1012335   Ia43e47f13c112122baec87ee7b639c17b49366c4   msm: camera: isp: Create union for update command payloa
1038520   Ib41f9892caca7f9d39675c6adf3b5eb8fdf88159   host: sdhci-msm: implement get_current_limit() host op
1012335   I9dfdc185fda547eea8fccd8d463911a93e582931   msm: camera: isp: Add code for new request frame command
1057219   I164a9eb308f5779d545766b18bb41184c49bbb3d   net: ipc_router: Fix remote port conn_info memory leak
1052854   I8844a3e8428b045514863d72c08f6c6b2b2ac2a4   qcom-charger: introduce step charging
866877   I941a577a427ad45e7519408425e00541e825efc6   scsi: ufs: Initiate crypto before SCSI for UFS fast boot
1046961   Ifcd560dacdba2600f2ae5d40a5c3e639ea291274   input: sensors: change sensors classdev device's parent
1052435   I1bafa7f824af8bbb3f67a71b81bf23b0a9c7164e   usb: phy: qusb: Set clamp_dig_n signal based on usb stat
1050517   I19f4f6e764ffde26ecf3b7cce3fb53a9bf2cc91a   clk: msm: Add support for block reset clocks for msmcoba
1061765   I4bc919ba7cf24d73cbc6cac392e00f81005bf64c   ARM: dts: msm: Update qusb2 efuse address for msmcobalt-
1055885   Ie1b64275a0c6141f94faaf3e63fcbf9b5438140c   mutex: Add a delay into the SPIN_ON_OWNER wait loop.
1054071   I7c1833d844fd432b33158686361e24e66a2fd92c   usb: dwc3: restart usb upon endpoint cmd timeout
1056615   I1fa587868b76d2de58c799846926c985aaf2686c   ARM: dts: msm: change the CX handle in PCIe node on msmc
1040852   I493d3b27cfeaaf63e3cf584c7048514d4d38905d   Replace %p with %pK to prevent leaking kernel address
1053360   I565f822a8fc795740155154a7f003340b26ee128   ext4 crypto: simplify interfaces to directory entry inse
1060558   I25406b13ac2007f1789d8d32e428c39dac4c29cf   msm: sde: Fix SDE rotator driver error handling
1057212   Id03ea9d622905393f81a9d4cafc111029ef6852d   coresight-stm: let runtime PM handle core clock
1061915   I3acdfc055d0c6a79a0aa65a715bae06dc475d078   usb: gadget: f_accessory: Make RX buffer size aligned to
1037897   I5a440f89153518507acdf5dad42625503732e59a   msm: ipa: fix potential race condition ioctls
1046961   I4cd8596fb4538b701317f01a6cafaa771041ffdd   ARM: dts: msm: correct Focaltech CTP irq flag configurat
1050065   I23ef75dd8bbf0f0b1c01fd30b8bae4116e106cc2   msm: pcie: config core and peripheral memory for PCIe cl
1047743   I08c854d5885672cbe5410efe0736640b55de8bbb   soc: qcom: glink: Validate ctx before using
1051911   I026eb3f68ec75b1cb08016d5a6a874a86c8703bc   ARM: dts: msm: add the smb138x tadc device for msmcobalt
996294   I5f7a19718b3b81a1e27d128bc69554cbaabf03f9   qseecom: improve listener resp processing if app is bloc
1004073   Idfd211db838cdde40ecc02a1803eac5c1ebfbc77   cfg80211: Add option to specify previous BSSID for Conne
1060737   Ibc4cf8328c209dbf968b7d6c498e1462397be351   usb: phy: handle phy related regulators properly
1061290   If2004dcf19649f68cc8fbe0506799d3c700293ff   tty: serial: msm: Add runtime PM and system sleep suppor
1057013   Ia678276ed1c3c223b1cedd1e6e8713ca06aefd14   msm: ipa3: Fix timeout period of IPA resource add depend
1057175   I40f5972be54393813ad04b07c032f494888ad5e8   ARM: dts: msm: change ebi buswidth for msmhamster
1056605   Idea1f11225d2d391eb86e3f62fcd675d90bde20d   msm: mdss: Initialize pp_sts variable before use
1061915   Ica933a7cf710ff082c54db77f94f802b6832bedb   USB: f_accessory: Fix crash if driver failed to initiali
1052435   Id51a2d34f61c0a41891551d15b706872abf13809   ARM: dts: msm: Update tcsr_clmap signal for msmcobalt
1060305   I93c9340439dd65c50764dd078071bf66f65a9464   msm: ipa3: fix GSI ring DMA allocation parameters
1054875   I49ef2a32ffd731ab2875c941c9d11155f2aba9e2   diag: Add error handler to free buffers when fwd fails
1046961   I7abee3f1ad6c73e1c38aa64e627ffd73f6f9d3b2   input: ft5x06_ts: do not free input_dev after unregister
1037131   I1798cb3af1d2ca362d3b7b14318bb08994670f4c   msm: pcie: correct size of local PCIe clock frequency bu
996660   I542b0de66948610135cf69a3d24c1561017fe7a8   cfg80211: Define macro to indicate bssid based scan supp
1060633   Ie4ff10977840d8210482ad6f7bba4f0f0160aa03   qcom-charger: smb138x: update FCC settings in smb_params
1046961   I77d111d3ef800b636a337221d7e605f746a113dd   input: ft5x06_ts: add gesture feature support
1061734   Ic5d1a38dfb6ea3e255424af135e2afbe47d1fc18   icnss: Shutdown only if probed
1051911   Ie99dfe41d8f50f82097c45cd760bf8352c635381   iio: adc: add driver for TADC
1008025   I06a02a3e6c70160083e17291cf08f1e9b375a26f   netfilter: xt_quota2: 3.18 netlink notification fix
1061765   I7a2efa3c2409ba5dbb1ae9581738518b9457a971   usb: phy: qusb: Update tune1 param from efuse register
996660   I20cf654661c11880055d022e0c9ec77beab659e8   cfg80211: Allow a scan request for a specific BSSID
1057180   Ic3968fd4c0232da6bc9a97d94376f540f62bd2e6   icnss: Handle wait being interrupted

Change-Id: I16ebb6f6aa72ed087100c584e2a3c49c68c581ce
CRs-Fixed: 1061279, 1017614, 1037346, 1055885, 1050517, 1057175, 1014464, 1058794, 1059620, 1060558, 1046581, 1060737, 1057013, 1046961, 1061915, 1054071, 1051911, 1037897, 1056615, 1052854, 1056610, 1057219, 1060305, 866877, 1060158, 996294, 1055875, 1037131, 1004073, 1058351, 996660, 1057180, 1040852, 1061734, 1060058, 1050065, 1052435, 1038520, 1060725, 1057212, 1053360, 1012335, 1061290, 1058912, 1008025, 1047743, 1054875, 747810, 1056605, 1060633, 1061765

6 files changed, 142 insertions, 35 deletions

diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h
index b411a0be4e67..f366d526c138 100644
--- a/include/dt-bindings/clock/msm-clocks-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-cobalt.h
@@ -500,4 +500,23 @@
 #define clk_audio_pmi_clk			0xcbfe416d
 #define clk_audio_ap_clk2			0x454d1e91
 
+/* GCC block resets */
+#define QUSB2PHY_PRIM_BCR			0
+#define QUSB2PHY_SEC_BCR			1
+#define BLSP1_BCR				2
+#define BLSP2_BCR				3
+#define BOOT_ROM_BCR				4
+#define PRNG_BCR				5
+#define UFS_BCR					6
+#define USB_30_BCR				7
+#define USB3_PHY_BCR				8
+#define USB3PHY_PHY_BCR				9
+#define PCIE_0_PHY_BCR				10
+#define PCIE_PHY_BCR				11
+#define PCIE_PHY_COM_BCR			12
+#define PCIE_PHY_NOCSR_COM_PHY_BCR		13
+
+/* MMSS block resets */
+#define CAMSS_MICRO_BCR				0
+
 #endif
diff --git a/include/linux/input/ft5x06_ts.h b/include/linux/input/ft5x06_ts.h
index bd37af71fe0d..3825f9d1e68c 100644
--- a/include/linux/input/ft5x06_ts.h
+++ b/include/linux/input/ft5x06_ts.h
@@ -34,11 +34,11 @@ struct fw_upgrade_info {
 	u16 delay_erase_flash;
 };
 
-struct ft5x06_psensor_platform_data {
-	struct input_dev *input_psensor_dev;
-	struct sensors_classdev ps_cdev;
-	int tp_psensor_opened;
-	char tp_psensor_data; /* 0 near, 1 far */
+struct ft5x06_gesture_platform_data {
+	int gesture_enable_to_set;	/* enable/disable gesture */
+	int in_pocket;	/* whether in pocket mode or not */
+	struct device *dev;
+	struct class *gesture_class;
 	struct ft5x06_ts_data *data;
 };
 
@@ -68,7 +68,7 @@ struct ft5x06_ts_platform_data {
 	bool no_force_update;
 	bool i2c_pull_up;
 	bool ignore_id_check;
-	bool psensor_support;
+	bool gesture_support;
 	int (*power_init)(bool);
 	int (*power_on)(bool);
 };
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index e0b0d2b12b88..73b0fbe034fb 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -63,6 +63,9 @@
 
 struct wiphy;
 
+#define CFG80211_SCAN_BSSID 1
+#define CFG80211_CONNECT_PREV_BSSID 1
+
 /*
  * wireless hardware capability structures
  */
@@ -1455,6 +1458,7 @@ struct cfg80211_ssid {
  * @mac_addr_mask: MAC address mask used with randomisation, bits that
  *	are 0 in the mask should be randomised, bits that are 1 should
  *	be taken from the @mac_addr
+ * @bssid: BSSID to scan for (most commonly, the wildcard BSSID)
  */
 struct cfg80211_scan_request {
 	struct cfg80211_ssid *ssids;
@@ -1471,6 +1475,7 @@ struct cfg80211_scan_request {
 
 	u8 mac_addr[ETH_ALEN] __aligned(2);
 	u8 mac_addr_mask[ETH_ALEN] __aligned(2);
+	u8 bssid[ETH_ALEN] __aligned(2);
 
 	/* internal */
 	struct wiphy *wiphy;
@@ -1893,6 +1898,7 @@ struct cfg80211_ibss_params {
  * @vht_capa_mask: The bits of vht_capa which are to be used.
  * @pbss: if set, connect to a PCP instead of AP. Valid for DMG
  *	networks.
+ * @prev_bssid: previous BSSID, if not %NULL use reassociate frame
  */
 struct cfg80211_connect_params {
 	struct ieee80211_channel *channel;
@@ -1916,6 +1922,7 @@ struct cfg80211_connect_params {
 	struct ieee80211_vht_cap vht_capa;
 	struct ieee80211_vht_cap vht_capa_mask;
 	bool pbss;
+	const u8 *prev_bssid;
 };
 
 /**
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index b5323800eeb5..c4984741be61 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -322,7 +322,9 @@
  * @NL80211_CMD_GET_SCAN: get scan results
  * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
  *	%NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
- *	probe requests at CCK rate or not.
+ *	probe requests at CCK rate or not. %NL80211_ATTR_MAC can be used to
+ *	specify a BSSID to scan for; if not included, the wildcard BSSID will
+ *	be used.
  * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
  *	NL80211_CMD_GET_SCAN and on the "scan" multicast group)
  * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
diff --git a/include/uapi/media/msm_cam_sensor.h b/include/uapi/media/msm_cam_sensor.h
index 540a96c57e5b..2c7ada5d02cf 100644
--- a/include/uapi/media/msm_cam_sensor.h
+++ b/include/uapi/media/msm_cam_sensor.h
@@ -34,6 +34,9 @@
 #define MAX_NUMBER_OF_STEPS 47
 #define MAX_REGULATOR 5
 
+/*msm_flash_query_data_t query types*/
+#define FLASH_QUERY_CURRENT 1
+
 #define MSM_V4L2_PIX_FMT_META v4l2_fourcc('M', 'E', 'T', 'A') /* META */
 #define MSM_V4L2_PIX_FMT_META10 v4l2_fourcc('M', 'E', '1', '0') /* META10 */
 #define MSM_V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4')
@@ -531,6 +534,12 @@ struct msm_flash_cfg_data_t {
 	} cfg;
 };
 
+struct msm_flash_query_data_t {
+	int32_t flags;
+	int32_t query_type;
+	int32_t max_avail_curr;
+};
+
 /* sensor init structures and enums */
 enum msm_sensor_init_cfg_type_t {
 	CFG_SINIT_PROBE,
@@ -586,5 +595,8 @@ struct sensor_init_cfg_data {
 #define VIDIOC_MSM_OIS_CFG_DOWNLOAD \
 	_IOWR('V', BASE_VIDIOC_PRIVATE + 14, struct msm_ois_cfg_download_data)
 
+#define VIDIOC_MSM_FLASH_QUERY_DATA \
+	_IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_flash_query_data_t)
+
 #endif
 
diff --git a/include/uapi/media/msmb_isp.h b/include/uapi/media/msmb_isp.h
index 9f933dc7e84f..82e0bdd9209d 100644
--- a/include/uapi/media/msmb_isp.h
+++ b/include/uapi/media/msmb_isp.h
@@ -324,7 +324,9 @@ enum msm_vfe_axi_stream_update_type {
 	UPDATE_STREAM_ADD_BUFQ,
 	UPDATE_STREAM_REMOVE_BUFQ,
 	UPDATE_STREAM_SW_FRAME_DROP,
+	UPDATE_STREAM_REQUEST_FRAMES_VER2,
 };
+#define UPDATE_STREAM_REQUEST_FRAMES_VER2 UPDATE_STREAM_REQUEST_FRAMES_VER2
 
 enum msm_vfe_iommu_type {
 	IOMMU_ATTACH,
@@ -347,6 +349,13 @@ struct msm_vfe_axi_stream_cfg_update_info {
 	struct msm_isp_sw_framskip sw_skip_info;
 };
 
+struct msm_vfe_axi_stream_cfg_update_info_req_frm {
+	uint32_t stream_handle;
+	uint32_t user_stream_id;
+	uint32_t frame_id;
+	uint32_t buf_index;
+};
+
 struct msm_vfe_axi_halt_cmd {
 	uint32_t stop_camif;
 	uint32_t overflow_detected;
@@ -365,8 +374,15 @@ struct msm_vfe_axi_restart_cmd {
 struct msm_vfe_axi_stream_update_cmd {
 	uint32_t num_streams;
 	enum msm_vfe_axi_stream_update_type update_type;
-	struct msm_vfe_axi_stream_cfg_update_info
+	/*
+	 * For backward compatibility, ensure 1st member of any struct
+	 * in union below is uint32_t stream_handle.
+	 */
+	union {
+		struct msm_vfe_axi_stream_cfg_update_info
 					update_info[MSM_ISP_STATS_MAX];
+		struct msm_vfe_axi_stream_cfg_update_info_req_frm req_frm_ver2;
+	};
 };
 
 struct msm_vfe_smmu_attach_cmd {
@@ -808,82 +824,133 @@ struct msm_isp_ahb_clk_cfg {
 #define V4L2_PIX_FMT_SGRBG14 v4l2_fourcc('B', 'A', '1', '4') /* 14 GRGR.BGBG.*/
 #define V4L2_PIX_FMT_SRGGB14 v4l2_fourcc('R', 'G', '1', '4') /* 14 RGRG.GBGB.*/
 
+enum msm_isp_ioctl_cmd_code {
+	MSM_VFE_REG_CFG = BASE_VIDIOC_PRIVATE,
+	MSM_ISP_REQUEST_BUF,
+	MSM_ISP_ENQUEUE_BUF,
+	MSM_ISP_RELEASE_BUF,
+	MSM_ISP_REQUEST_STREAM,
+	MSM_ISP_CFG_STREAM,
+	MSM_ISP_RELEASE_STREAM,
+	MSM_ISP_INPUT_CFG,
+	MSM_ISP_SET_SRC_STATE,
+	MSM_ISP_REQUEST_STATS_STREAM,
+	MSM_ISP_CFG_STATS_STREAM,
+	MSM_ISP_RELEASE_STATS_STREAM,
+	MSM_ISP_REG_UPDATE_CMD,
+	MSM_ISP_UPDATE_STREAM,
+	MSM_VFE_REG_LIST_CFG,
+	MSM_ISP_SMMU_ATTACH,
+	MSM_ISP_UPDATE_STATS_STREAM,
+	MSM_ISP_AXI_HALT,
+	MSM_ISP_AXI_RESET,
+	MSM_ISP_AXI_RESTART,
+	MSM_ISP_FETCH_ENG_START,
+	MSM_ISP_DEQUEUE_BUF,
+	MSM_ISP_SET_DUAL_HW_MASTER_SLAVE,
+	MSM_ISP_MAP_BUF_START_FE,
+	MSM_ISP_UNMAP_BUF,
+};
+
 #define VIDIOC_MSM_VFE_REG_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE, struct msm_vfe_cfg_cmd2)
+	_IOWR('V', MSM_VFE_REG_CFG, \
+		struct msm_vfe_cfg_cmd2)
 
 #define VIDIOC_MSM_ISP_REQUEST_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+1, struct msm_isp_buf_request)
+	_IOWR('V', MSM_ISP_REQUEST_BUF, \
+		struct msm_isp_buf_request)
 
 #define VIDIOC_MSM_ISP_ENQUEUE_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+2, struct msm_isp_qbuf_info)
+	_IOWR('V', MSM_ISP_ENQUEUE_BUF, \
+		struct msm_isp_qbuf_info)
 
 #define VIDIOC_MSM_ISP_RELEASE_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+3, struct msm_isp_buf_request)
+	_IOWR('V', MSM_ISP_RELEASE_BUF, \
+		struct msm_isp_buf_request)
 
 #define VIDIOC_MSM_ISP_REQUEST_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+4, struct msm_vfe_axi_stream_request_cmd)
+	_IOWR('V', MSM_ISP_REQUEST_STREAM, \
+		struct msm_vfe_axi_stream_request_cmd)
 
 #define VIDIOC_MSM_ISP_CFG_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+5, struct msm_vfe_axi_stream_cfg_cmd)
+	_IOWR('V', MSM_ISP_CFG_STREAM, \
+		struct msm_vfe_axi_stream_cfg_cmd)
 
 #define VIDIOC_MSM_ISP_RELEASE_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+6, struct msm_vfe_axi_stream_release_cmd)
+	_IOWR('V', MSM_ISP_RELEASE_STREAM, \
+		struct msm_vfe_axi_stream_release_cmd)
 
 #define VIDIOC_MSM_ISP_INPUT_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+7, struct msm_vfe_input_cfg)
+	_IOWR('V', MSM_ISP_INPUT_CFG, \
+		struct msm_vfe_input_cfg)
 
 #define VIDIOC_MSM_ISP_SET_SRC_STATE \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+8, struct msm_vfe_axi_src_state)
+	_IOWR('V', MSM_ISP_SET_SRC_STATE, \
+		struct msm_vfe_axi_src_state)
 
 #define VIDIOC_MSM_ISP_REQUEST_STATS_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+9, \
-	struct msm_vfe_stats_stream_request_cmd)
+	_IOWR('V', MSM_ISP_REQUEST_STATS_STREAM, \
+		struct msm_vfe_stats_stream_request_cmd)
 
 #define VIDIOC_MSM_ISP_CFG_STATS_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+10, struct msm_vfe_stats_stream_cfg_cmd)
+	_IOWR('V', MSM_ISP_CFG_STATS_STREAM, \
+		struct msm_vfe_stats_stream_cfg_cmd)
 
 #define VIDIOC_MSM_ISP_RELEASE_STATS_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+11, \
-	struct msm_vfe_stats_stream_release_cmd)
+	_IOWR('V', MSM_ISP_RELEASE_STATS_STREAM, \
+		struct msm_vfe_stats_stream_release_cmd)
 
 #define VIDIOC_MSM_ISP_REG_UPDATE_CMD \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+12, enum msm_vfe_input_src)
+	_IOWR('V', MSM_ISP_REG_UPDATE_CMD, \
+		enum msm_vfe_input_src)
 
 #define VIDIOC_MSM_ISP_UPDATE_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+13, struct msm_vfe_axi_stream_update_cmd)
+	_IOWR('V', MSM_ISP_UPDATE_STREAM, \
+		struct msm_vfe_axi_stream_update_cmd)
 
 #define VIDIOC_MSM_VFE_REG_LIST_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+14, struct msm_vfe_cfg_cmd_list)
+	_IOWR('V', MSM_VFE_REG_LIST_CFG, \
+		struct msm_vfe_cfg_cmd_list)
 
 #define VIDIOC_MSM_ISP_SMMU_ATTACH \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+15, struct msm_vfe_smmu_attach_cmd)
+	_IOWR('V', MSM_ISP_SMMU_ATTACH, \
+		struct msm_vfe_smmu_attach_cmd)
 
 #define VIDIOC_MSM_ISP_UPDATE_STATS_STREAM \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+16, struct msm_vfe_axi_stream_update_cmd)
+	_IOWR('V', MSM_ISP_UPDATE_STATS_STREAM, \
+		struct msm_vfe_axi_stream_update_cmd)
 
 #define VIDIOC_MSM_ISP_AXI_HALT \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+17, struct msm_vfe_axi_halt_cmd)
+	_IOWR('V', MSM_ISP_AXI_HALT, \
+		struct msm_vfe_axi_halt_cmd)
 
 #define VIDIOC_MSM_ISP_AXI_RESET \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+18, struct msm_vfe_axi_reset_cmd)
+	_IOWR('V', MSM_ISP_AXI_RESET, \
+		struct msm_vfe_axi_reset_cmd)
 
 #define VIDIOC_MSM_ISP_AXI_RESTART \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+19, struct msm_vfe_axi_restart_cmd)
+	_IOWR('V', MSM_ISP_AXI_RESTART, \
+		struct msm_vfe_axi_restart_cmd)
 
 #define VIDIOC_MSM_ISP_FETCH_ENG_START \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+20, struct msm_vfe_fetch_eng_start)
+	_IOWR('V', MSM_ISP_FETCH_ENG_START, \
+		struct msm_vfe_fetch_eng_start)
 
 #define VIDIOC_MSM_ISP_DEQUEUE_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+21, struct msm_isp_qbuf_info)
+	_IOWR('V', MSM_ISP_DEQUEUE_BUF, \
+		struct msm_isp_qbuf_info)
 
 #define VIDIOC_MSM_ISP_SET_DUAL_HW_MASTER_SLAVE \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+22, struct msm_isp_set_dual_hw_ms_cmd)
+	_IOWR('V', MSM_ISP_SET_DUAL_HW_MASTER_SLAVE, \
+		struct msm_isp_set_dual_hw_ms_cmd)
 
 #define VIDIOC_MSM_ISP_MAP_BUF_START_FE \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+23, struct msm_vfe_fetch_eng_start)
+	_IOWR('V', MSM_ISP_MAP_BUF_START_FE, \
+		struct msm_vfe_fetch_eng_start)
 
 #define VIDIOC_MSM_ISP_UNMAP_BUF \
-	_IOWR('V', BASE_VIDIOC_PRIVATE+24, struct msm_isp_unmap_buf_req)
+	_IOWR('V', MSM_ISP_UNMAP_BUF, \
+		struct msm_isp_unmap_buf_req)
 
 #define VIDIOC_MSM_ISP_AHB_CLK_CFG \
 	_IOWR('V', BASE_VIDIOC_PRIVATE+25, struct msm_isp_ahb_clk_cfg)