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

Commit b2c12572 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Correct the CPHY settings for Kona"

parents 12fbb647 6ac9dbaf

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

+12 −15
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */



#ifndef _CAM_CSIPHY_1_2_1_HWREG_H_
@@ -15,7 +15,7 @@ struct csiphy_reg_parms_t csiphy_v1_2_1 = { 
	.csiphy_common_array_size = 4,

	.csiphy_reset_array_size = 4,

	.csiphy_2ph_config_array_size = 20,

	.csiphy_3ph_config_array_size = 32,

	.csiphy_3ph_config_array_size = 31,

	.csiphy_2ph_clock_lane = 0x1,

	.csiphy_2ph_combo_ck_ln = 0x10,

};
@@ -308,7 +308,6 @@ csiphy_reg_t csiphy_3ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x01CC, 0x41, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0164, 0x33, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x01DC, 0x50, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0984, 0x20, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x09B0, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x0E, 0x00, CSIPHY_DEFAULT_PARAMS},

	},
@@ -317,10 +316,10 @@ csiphy_reg_t csiphy_3ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x0A90, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A94, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A98, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A90, 0x17, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A94, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A98, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A8C, 0xBF, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A90, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A94, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A98, 0x1A, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A8C, 0xAF, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0368, 0xA0, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x036C, 0x25, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0304, 0x06, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -342,8 +341,7 @@ csiphy_reg_t csiphy_3ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x03CC, 0x41, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0364, 0x33, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x03DC, 0x50, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0A84, 0x20, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0AB0, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0AB0, 0x03, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x0E, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

	{
@@ -351,10 +349,10 @@ csiphy_reg_t csiphy_3ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x0B90, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B94, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B98, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B90, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B94, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B98, 0x1C, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B8C, 0x3F, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B90, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B94, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B98, 0x1A, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B8C, 0xAF, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0568, 0xA0, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x056C, 0x25, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0504, 0x06, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -376,8 +374,7 @@ csiphy_reg_t csiphy_3ph_v1_2_1_reg[MAX_LANES][MAX_SETTINGS_PER_LANE] = { 
		{0x05CC, 0x41, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0564, 0x33, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x05DC, 0x50, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0B84, 0x20, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0BB0, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0BB0, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0800, 0x0E, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

};