Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84e9a7ca authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: csiphy: correct DPHY bring up sequence" into dev/msm-4.14-camx

parents 7129141e 58ab6e8c

drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/include/cam_csiphy_1_2_hwreg.h

+13 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct csiphy_reg_parms_t csiphy_v1_2 = { 
	.mipi_csiphy_glbl_irq_cmd_addr = 0x828,

	.csiphy_common_array_size = 6,

	.csiphy_reset_array_size = 5,

	.csiphy_2ph_config_array_size = 21,

	.csiphy_2ph_config_array_size = 22,

	.csiphy_3ph_config_array_size = 38,

	.csiphy_2ph_clock_lane = 0x1,

	.csiphy_2ph_combo_ck_ln = 0x10,
@@ -78,10 +78,11 @@ csiphy_reg_t csiphy_2ph_v1_2_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x0000, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0020, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0008, 0x04, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},

		{0x0008, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},

		{0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0010, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

	{

		{0x0730, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -105,6 +106,7 @@ csiphy_reg_t csiphy_2ph_v1_2_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x070c, 0xFF, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0710, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

	{

		{0x0230, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -128,6 +130,7 @@ csiphy_reg_t csiphy_2ph_v1_2_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x020c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0210, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

	{

		{0x0430, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -151,6 +154,7 @@ csiphy_reg_t csiphy_2ph_v1_2_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x040c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0410, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

	{

		{0x0630, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -174,6 +178,7 @@ csiphy_reg_t csiphy_2ph_v1_2_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x060c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

};
@@ -197,10 +202,11 @@ struct csiphy_reg_t 
		{0x0000, 0x91, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0020, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0008, 0x04, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},

		{0x0008, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},

		{0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0010, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DNP_PARAMS},

	},

	{

		{0x0730, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -224,6 +230,7 @@ struct csiphy_reg_t 
		{0x070c, 0xFF, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0710, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DNP_PARAMS},

	},

	{

		{0x0230, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -247,6 +254,7 @@ struct csiphy_reg_t 
		{0x020c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0210, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DNP_PARAMS},

	},

	{

		{0x0430, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -270,6 +278,7 @@ struct csiphy_reg_t 
		{0x040c, 0x00, 0x00, CSIPHY_DNP_PARAMS},

		{0x0410, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DNP_PARAMS},

	},

	{

		{0x0630, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -293,6 +302,7 @@ struct csiphy_reg_t 
		{0x060c, 0xFF, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x00, 0x00, CSIPHY_DNP_PARAMS},

	},

};