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

Commit 4cc39c64 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Correct csid lane assign on 8937"

parents 0b6897d9 05cc255e

drivers/media/platform/msm/camera_v2/sensor/csid/include/msm_csid_3_4_2_hwreg.h

0 → 100644
+63 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef MSM_CSID_3_4_2_HWREG_H

#define MSM_CSID_3_4_2_HWREG_H



#include <sensor/csid/msm_csid.h>



uint8_t csid_lane_assign_v3_4_2[PHY_LANE_MAX] = {0, 4, 1, 2, 3};

struct csid_reg_parms_t csid_v3_4_2 = {

	/* MIPI	CSID registers */

	0x0,

	0x4,

	0x8,

	0xC,

	0x10,

	0x14,

	0x18,

	0x1C,

	0x20,

	0x60,

	0x64,

	0x68,

	0x6C,

	0x70,

	0x74,

	0x78,

	0x7C,

	0x80,

	0x84,

	0x88,

	0x8C,

	0x90,

	0x94,

	0x98,

	0xA0,

	0xA4,

	0xAC,

	0xB0,

	0xB4,

	11,

	0x7FFF,

	0x4,

	17,

	0x30040002,

	0xFFFFFFFF,

	0xFFFFFFFF,

	0xFFFFFFFF,

	0x7f010800,

	20,

	0xFFFFFFFF,

	0xFFFFFFFF,

};

#endif

drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c

+9 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "include/msm_csid_3_2_hwreg.h"

#include "include/msm_csid_3_5_hwreg.h"

#include "include/msm_csid_3_4_1_hwreg.h"

#include "include/msm_csid_3_4_2_hwreg.h"

#include "include/msm_csid_3_6_0_hwreg.h"

#include "cam_hw_ops.h"
@@ -39,6 +40,7 @@ 
#define CSID_VERSION_V33                      0x30030000

#define CSID_VERSION_V34                      0x30040000

#define CSID_VERSION_V34_1                    0x30040001

#define CSID_VERSION_V34_2                    0x30040002

#define CSID_VERSION_V36                      0x30060000

#define CSID_VERSION_V37                      0x30070000

#define CSID_VERSION_V35                      0x30050000
@@ -1246,6 +1248,12 @@ static int csid_probe(struct platform_device *pdev) 
		new_csid_dev->hw_dts_version = CSID_VERSION_V34_1;

		new_csid_dev->ctrl_reg->csid_lane_assign =

			csid_lane_assign_v3_4_1;

	} else if (of_device_is_compatible(new_csid_dev->pdev->dev.of_node,

		"qcom,csid-v3.4.2")) {

		new_csid_dev->ctrl_reg->csid_reg = csid_v3_4_2;

		new_csid_dev->hw_dts_version = CSID_VERSION_V34_2;

		new_csid_dev->ctrl_reg->csid_lane_assign =

			csid_lane_assign_v3_4_2;

	} else if (of_device_is_compatible(new_csid_dev->pdev->dev.of_node,

		"qcom,csid-v3.6.0")) {

		new_csid_dev->ctrl_reg->csid_reg = csid_v3_6_0;

drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_4_2_hwreg.h

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef MSM_CSIPHY_3_4_2_HWREG_H

#define MSM_CSIPHY_3_4_2_HWREG_H



#define ULPM_WAKE_UP_TIMER_MODE                   2

#define GLITCH_ELIMINATION_NUM                    0x12 /* bit [6:4] */



#include <sensor/csiphy/msm_csiphy.h>



struct csiphy_reg_parms_t csiphy_v3_4_2 = {

	.mipi_csiphy_interrupt_status0_addr = 0x8B0,

	.mipi_csiphy_interrupt_clear0_addr = 0x858,

	.mipi_csiphy_glbl_irq_cmd_addr = 0x828,

};



struct csiphy_reg_3ph_parms_t csiphy_v3_4_2_3ph = {

	/*MIPI CSI PHY registers*/

	{0x814, 0x0},

	{0x818, 0x1},

	{0x188, 0x7F},

	{0x18C, 0x7F},

	{0x190, 0x0},

	{0x104, 0x6},

	{0x108, 0x0},

	{0x10c, 0x0},

	{0x114, 0x20},

	{0x118, 0x3E},

	{0x11c, 0x41},

	{0x120, 0x41},

	{0x124, 0x7F},

	{0x128, 0x0},

	{0x12c, 0x0},

	{0x130, 0x1},

	{0x134, 0x0},

	{0x138, 0x0},

	{0x13C, 0x10},

	{0x140, 0x1},

	{0x144, GLITCH_ELIMINATION_NUM},

	{0x148, 0xFE},

	{0x14C, 0x1},

	{0x154, 0x0},

	{0x15C, 0x33},

	{0x160, ULPM_WAKE_UP_TIMER_MODE},

	{0x164, 0x48},

	{0x168, 0xA0},

	{0x16C, 0x17},

	{0x170, 0x41},

	{0x174, 0x41},

	{0x178, 0x3E},

	{0x17C, 0x0},

	{0x180, 0x0},

	{0x184, 0x7F},

	{0x1cc, 0x10},

	{0x81c, 0x6},

	{0x82c, 0xFF},

	{0x830, 0xFF},

	{0x834, 0xFB},

	{0x838, 0xFF},

	{0x83c, 0x7F},

	{0x840, 0xFF},

	{0x844, 0xFF},

	{0x848, 0xEF},

	{0x84c, 0xFF},

	{0x850, 0xFF},

	{0x854, 0xFF},

	{0x28, 0x0},

	{0x800, 0x2},

	{0x0, 0x8E},

	{0x4, 0x8},

	{0x8, 0x0},

	{0xC, 0xFF},

	{0x10, 0x56},

	{0x2C, 0x1},

	{0x30, 0x0},

	{0x34, 0x3},

	{0x38, 0xfe},

	{0x3C, 0xB8},

	{0x1C, 0xE7},

	{0x14, 0x0},

	{0x14, 0x60}

};

#endif

drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_5_hwreg.h

+66 −62
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
#ifndef MSM_CSIPHY_3_5_HWREG_H

#define MSM_CSIPHY_3_5_HWREG_H



#define ULPM_WAKE_UP_TIMER_MODE                   2

#define GLITCH_ELIMINATION_NUM                    0x12 /* bit [6:4] */



#include <sensor/csiphy/msm_csiphy.h>



struct csiphy_reg_parms_t csiphy_v3_5 = {
@@ -23,67 +26,68 @@ struct csiphy_reg_parms_t csiphy_v3_5 = { 


struct csiphy_reg_3ph_parms_t csiphy_v3_5_3ph = {

	/*MIPI CSI PHY registers*/

	0x814,

	0x818,

	0x188,

	0x18C,

	0x190,

	0x104,

	0x108,

	0x10c,

	0x114,

	0x118,

	0x11c,

	0x120,

	0x124,

	0x128,

	0x12c,

	0x130,

	0x134,

	0x138,

	0x13C,

	0x140,

	0x144,

	0x148,

	0x14C,

	0x154,

	0x15C,

	0x160,

	0x164,

	0x168,

	0x16C,

	0x170,

	0x174,

	0x178,

	0x17C,

	0x180,

	0x184,

	0x1cc,

	0x81c,

	0x82c,

	0x830,

	0x834,

	0x838,

	0x83c,

	0x840,

	0x844,

	0x848,

	0x84c,

	0x850,

	0x854,

	0x28,

	0x800,

	0x0,

	0x4,

	0x8,

	0xC,

	0x10,

	0x2C,

	0x30,

	0x34,

	0x38,

	0x3C,

	0x1C,

	0x14,

	{0x814, 0x0},

	{0x818, 0x1},

	{0x188, 0x7F},

	{0x18C, 0x7F},

	{0x190, 0x0},

	{0x104, 0x6},

	{0x108, 0x0},

	{0x10c, 0x0},

	{0x114, 0x20},

	{0x118, 0x3E},

	{0x11c, 0x41},

	{0x120, 0x41},

	{0x124, 0x7F},

	{0x128, 0x0},

	{0x12c, 0x0},

	{0x130, 0x1},

	{0x134, 0x0},

	{0x138, 0x0},

	{0x13C, 0x10},

	{0x140, 0x1},

	{0x144, GLITCH_ELIMINATION_NUM},

	{0x148, 0xFE},

	{0x14C, 0x1},

	{0x154, 0x0},

	{0x15C, 0x33},

	{0x160, ULPM_WAKE_UP_TIMER_MODE},

	{0x164, 0x48},

	{0x168, 0xA0},

	{0x16C, 0x17},

	{0x170, 0x41},

	{0x174, 0x41},

	{0x178, 0x3E},

	{0x17C, 0x0},

	{0x180, 0x0},

	{0x184, 0x7F},

	{0x1cc, 0x10},

	{0x81c, 0x6},

	{0x82c, 0xFF},

	{0x830, 0xFF},

	{0x834, 0xFB},

	{0x838, 0xFF},

	{0x83c, 0x7F},

	{0x840, 0xFF},

	{0x844, 0xFF},

	{0x848, 0xEF},

	{0x84c, 0xFF},

	{0x850, 0xFF},

	{0x854, 0xFF},

	{0x28, 0x0},

	{0x800, 0x0},

	{0x0, 0xCF},

	{0x4, 0x8},

	{0x8, 0x0},

	{0xC, 0xA5},

	{0x10, 0x52},

	{0x2C, 0x1},

	{0x30, 0x2},

	{0x34, 0x3},

	{0x38, 0x1},

	{0x3C, 0xB8},

	{0x1C, 0xA},

	{0x14, 0x0},

	{0x0, 0x0},

};

#endif

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

+224 −129

File changed.

Preview size limit exceeded, changes collapsed.