Merge "msm: camera: csiphy: Remove unused flags" into camera-kernel.lnx.4.0

drivers/cam_sensor_module/cam_cci/cam_cci_dev.h

@@ -32,7 +32,6 @@
 #include "cam_soc_util.h"
 #include "cam_debug_util.h"
 
-#define V4L2_IDENT_CCI 50005
 #define CCI_I2C_QUEUE_0_SIZE 128
 #define CCI_I2C_QUEUE_1_SIZE 32
 #define CCI_I2C_QUEUE_0_SIZE_V_1_2 64
@@ -43,16 +42,8 @@
 #define CCI_TIMEOUT msecs_to_jiffies(1500)
 #define NUM_QUEUES 2
 
-#define CCI_PINCTRL_STATE_DEFAULT "cci_default"
-#define CCI_PINCTRL_STATE_SLEEP "cci_suspend"
-
-#define CCI_NUM_CLK_MAX 16
-#define CCI_NUM_CLK_CASES 5
-#define CCI_CLK_SRC_NAME "cci_src_clk"
-#define MSM_CCI_WRITE_DATA_PAYLOAD_SIZE_10 10
 #define MSM_CCI_WRITE_DATA_PAYLOAD_SIZE_11 11
 #define BURST_MIN_FREE_SIZE 8
-#define MAX_LRME_V4l2_EVENTS 30
 
 /* Max bytes that can be read per CCI read transaction */
 #define CCI_READ_MAX 256

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h

@@ -30,10 +30,7 @@
 
 #define MAX_CSIPHY                  6
 
-#define MAX_LRME_V4l2_EVENTS        30
 #define CSIPHY_NUM_CLK_MAX          16
-#define MAX_CSIPHY_REG_ARRAY        70
-#define MAX_CSIPHY_CMN_REG_ARRAY    5
 
 #define MAX_LANES                   5
 #define MAX_SETTINGS_PER_LANE       43
@@ -43,9 +40,6 @@
 #define CAMX_CSIPHY_DEV_NAME "cam-csiphy-driver"
 #define CAM_CSIPHY_RX_CLK_SRC "cphy_rx_src_clk"
 
-#define CSIPHY_POWER_UP       0
-#define CSIPHY_POWER_DOWN     1
-
 #define CSIPHY_DEFAULT_PARAMS            0
 #define CSIPHY_LANE_ENABLE               1
 #define CSIPHY_SETTLE_CNT_LOWER_BYTE     2
@@ -60,8 +54,6 @@
 #define CAM_CSIPHY_MAX_DPHY_LANES    4
 #define CAM_CSIPHY_MAX_CPHY_LANES    3
 #define CAM_CSIPHY_MAX_CPHY_DPHY_COMBO_LN    3
-#define CAM_CSIPHY_MAX_CPHY_COMBO_LN         3
-
 
 #define DPHY_LANE_0    BIT(0)
 #define CPHY_LANE_0    BIT(1)

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_soc.h

@@ -22,7 +22,6 @@
 #include "cam_csiphy_core.h"
 
 #define CSI_3PHASE_HW                               1
-#define CSIPHY_VERSION_V35                        0x35
 #define CSIPHY_VERSION_V10                        0x10
 #define CSIPHY_VERSION_V11                        0x11
 #define CSIPHY_VERSION_V12                        0x12