samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: csiphy: CSIPHY DPHY DeSkew Calibration" into camera-kernel.lnx.4.0

Browse Source
This commit is contained in:
Haritha Chintalapati
2020-11-18 15:09:20 -08:00
committed by Gerrit - the friendly Code Review server
parent dd1071a4c6 60a0d836da
commit 0166bc768c
2 changed files with 2 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/cam_sensor_module/cam_csiphy/include/cam_csiphy_1_2_3_hwreg.h
View File

@@ -15,7 +15,7 @@ struct csiphy_reg_parms_t csiphy_v1_2_3 = {
.csiphy_interrupt_status_size = 11,
.csiphy_common_array_size = 8,
.csiphy_reset_array_size = 5,
.csiphy_2ph_config_array_size = 19,
.csiphy_2ph_config_array_size = 16,
.csiphy_3ph_config_array_size = 26,
.csiphy_2ph_3ph_config_array_size = 0,
.csiphy_2ph_clock_lane = 0x1,
@@ -72,9 +72,6 @@ struct csiphy_reg_t csiphy_2ph_v1_2_3_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = {
{0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0020, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0008, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x005C, 0xC0, 0x00, CSIPHY_SKEW_CAL},
{0x0060, 0x0D, 0x00, CSIPHY_SKEW_CAL},
{0x0064, 0x7F, 0x00, CSIPHY_SKEW_CAL},
{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
},
{
@@ -93,9 +90,6 @@ struct csiphy_reg_t csiphy_2ph_v1_2_3_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = {
{0x0704, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0720, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0708, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x075C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0760, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0764, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
},
{
@@ -114,9 +108,6 @@ struct csiphy_reg_t csiphy_2ph_v1_2_3_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = {
{0x0204, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0220, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0208, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x025C, 0xC0, 0x00, CSIPHY_SKEW_CAL},
{0x0260, 0x0D, 0x00, CSIPHY_SKEW_CAL},
{0x0264, 0x7F, 0x00, CSIPHY_SKEW_CAL},
{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
},
{
@@ -135,9 +126,6 @@ struct csiphy_reg_t csiphy_2ph_v1_2_3_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = {
{0x0404, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0420, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0408, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x045C, 0xC0, 0x00, CSIPHY_SKEW_CAL},
{0x0460, 0x0D, 0x00, CSIPHY_SKEW_CAL},
{0x0464, 0x7F, 0x00, CSIPHY_SKEW_CAL},
{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
},
{
@@ -156,9 +144,6 @@ struct csiphy_reg_t csiphy_2ph_v1_2_3_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = {
{0x0604, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0620, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0608, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x065C, 0xC0, 0x00, CSIPHY_SKEW_CAL},
{0x0660, 0x0D, 0x00, CSIPHY_SKEW_CAL},
{0x0664, 0x7F, 0x00, CSIPHY_SKEW_CAL},
{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
},
};
@@ -181,9 +166,6 @@ struct csiphy_reg_t
{0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0020, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0008, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x005C, 0xC0, 0x00, CSIPHY_SKEW_CAL},
{0x0060, 0x0D, 0x00, CSIPHY_SKEW_CAL},
{0x0064, 0x7F, 0x00, CSIPHY_SKEW_CAL},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
},
{
@@ -202,9 +184,6 @@ struct csiphy_reg_t
{0x0704, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0720, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0708, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x075C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0760, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0764, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
},
{
@@ -223,9 +202,6 @@ struct csiphy_reg_t
{0x0204, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0220, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0208, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x025C, 0xC0, 0x00, CSIPHY_SKEW_CAL},
{0x0260, 0x0D, 0x00, CSIPHY_SKEW_CAL},
{0x0264, 0x7F, 0x00, CSIPHY_SKEW_CAL},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
},
{
@@ -244,9 +220,6 @@ struct csiphy_reg_t
{0x0404, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0420, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0408, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x045C, 0xC0, 0x00, CSIPHY_SKEW_CAL},
{0x0460, 0x0D, 0x00, CSIPHY_SKEW_CAL},
{0x0464, 0x7F, 0x00, CSIPHY_SKEW_CAL},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
},
{
@@ -265,9 +238,6 @@ struct csiphy_reg_t
{0x0604, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0620, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0608, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x065C, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0660, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0664, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
},
};

20
drivers/cam_sensor_module/cam_csiphy/include/cam_csiphy_1_2_5_hwreg.h
View File

@@ -15,7 +15,7 @@ struct csiphy_reg_parms_t csiphy_v1_2_5 = {
.csiphy_interrupt_status_size = 11,
.csiphy_common_array_size = 6,
.csiphy_reset_array_size = 5,
.csiphy_2ph_config_array_size = 23,
.csiphy_2ph_config_array_size = 21,
.csiphy_3ph_config_array_size = 30,
.csiphy_2ph_clock_lane = 0x1,
.csiphy_2ph_combo_ck_ln = 0x10,
@@ -74,8 +74,6 @@ csiphy_reg_t csiphy_2ph_v1_2_5_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = {
{0x0008, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x0010, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x005C, 0xC0, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0060, 0x0D, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0000, 0x00, 0x00, CSIPHY_DNP_PARAMS},
},
@@ -124,8 +122,6 @@ csiphy_reg_t csiphy_2ph_v1_2_5_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = {
{0x0208, 0x04, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x0210, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x025C, 0xC0, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0260, 0x0D, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0000, 0x00, 0x00, CSIPHY_DNP_PARAMS},
},
@@ -149,8 +145,6 @@ csiphy_reg_t csiphy_2ph_v1_2_5_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = {
{0x0408, 0x04, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x0410, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x045C, 0xC0, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0460, 0x0D, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0000, 0x00, 0x00, CSIPHY_DNP_PARAMS},
},
@@ -174,8 +168,6 @@ csiphy_reg_t csiphy_2ph_v1_2_5_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = {
{0x0608, 0x04, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x065C, 0xC0, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0660, 0x0D, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0000, 0x00, 0x00, CSIPHY_DNP_PARAMS},
},
@@ -202,8 +194,6 @@ struct csiphy_reg_t
{0x0008, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x0010, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x005C, 0xC0, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0060, 0x0D, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0000, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0000, 0x00, 0x00, CSIPHY_DNP_PARAMS},
@@ -229,8 +219,6 @@ struct csiphy_reg_t
{0x070c, 0xFF, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0710, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x075C, 0xC0, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0760, 0x0D, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
},
{
@@ -252,8 +240,6 @@ struct csiphy_reg_t
{0x0208, 0x04, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x0210, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x025C, 0xC0, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0260, 0x0D, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0000, 0x00, 0x00, CSIPHY_DNP_PARAMS},
{0x0000, 0x00, 0x00, CSIPHY_DNP_PARAMS},
@@ -278,8 +264,6 @@ struct csiphy_reg_t
{0x0408, 0x04, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},
{0x0410, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x045C, 0xC0, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0460, 0x0D, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0000, 0x00, 0x00, CSIPHY_DNP_PARAMS},
},
@@ -304,8 +288,6 @@ struct csiphy_reg_t
{0x060c, 0xFF, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x065C, 0xC0, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0660, 0x0D, 0x00, CSIPHY_DEFAULT_PARAMS},
{0x0800, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
},
};