evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: Correct the settings for csiphy clock lane"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-28 17:03:43 -08:00 • committed by Gerrit - the friendly Code Review server
commit dbc4dc7807
4 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_5_0_1_hwreg.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -99,6 +99,7 @@ struct csiphy_reg_3ph_parms_t csiphy_v5_0_1_3ph = {
{0x70C, 0xA5}, {0x70C, 0xA5},
{0x38, 0xFE}, {0x38, 0xFE},
{0x81c, 0x2}, {0x81c, 0x2},
{0x700, 0x80},
}; };
struct csiphy_settings_t csiphy_combo_mode_v5_0_1 = { struct csiphy_settings_t csiphy_combo_mode_v5_0_1 = {

3
drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_5_0_hwreg.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -100,6 +100,7 @@ struct csiphy_reg_3ph_parms_t csiphy_v5_0_3ph = {
{0x70C, 0x16}, {0x70C, 0x16},
{0x38, 0xFE}, {0x38, 0xFE},
{0x81c, 0x6}, {0x81c, 0x6},
{0x700, 0x80},
}; };
struct csiphy_settings_t csiphy_combo_mode_v5_0 = { struct csiphy_settings_t csiphy_combo_mode_v5_0 = {

24
drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -46,6 +46,7 @@
#define MSM_CSIPHY_DRV_NAME "msm_csiphy" #define MSM_CSIPHY_DRV_NAME "msm_csiphy"
#define CLK_LANE_OFFSET 1 #define CLK_LANE_OFFSET 1
#define NUM_LANES_OFFSET 4 #define NUM_LANES_OFFSET 4
#define CLOCK_LANE 0x02
#define CSI_3PHASE_HW 1 #define CSI_3PHASE_HW 1
#define MAX_DPHY_DATA_LN 4 #define MAX_DPHY_DATA_LN 4
@ -683,12 +684,21 @@ static int msm_csiphy_2phase_lane_config_v50(
csiphybase + csiphy_dev->ctrl_reg-> csiphybase + csiphy_dev->ctrl_reg->
csiphy_3ph_reg. csiphy_3ph_reg.
mipi_csiphy_2ph_lnn_ctrl15.addr + offset); mipi_csiphy_2ph_lnn_ctrl15.addr + offset);
msm_camera_io_w(csiphy_dev->ctrl_reg-> if (mask == CLOCK_LANE)
csiphy_3ph_reg. msm_camera_io_w(csiphy_dev->ctrl_reg->
mipi_csiphy_2ph_lnn_ctrl0.data, csiphy_3ph_reg.
csiphybase + csiphy_dev->ctrl_reg-> mipi_csiphy_2ph_lnck_ctrl0.data,
csiphy_3ph_reg. csiphybase + csiphy_dev->ctrl_reg->
mipi_csiphy_2ph_lnn_ctrl0.addr + offset); csiphy_3ph_reg.
mipi_csiphy_2ph_lnck_ctrl0.addr);
else
msm_camera_io_w(csiphy_dev->ctrl_reg->
csiphy_3ph_reg.
mipi_csiphy_2ph_lnn_ctrl0.data,
csiphybase + csiphy_dev->ctrl_reg->
csiphy_3ph_reg.
mipi_csiphy_2ph_lnn_ctrl0.addr +
offset);
msm_camera_io_w(csiphy_dev->ctrl_reg-> msm_camera_io_w(csiphy_dev->ctrl_reg->
csiphy_3ph_reg. csiphy_3ph_reg.
mipi_csiphy_2ph_lnn_cfg1.data, mipi_csiphy_2ph_lnn_cfg1.data,

3
drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -141,6 +141,7 @@ struct csiphy_reg_3ph_parms_t {
struct csiphy_reg_t mipi_csiphy_2ph_lnck_ctrl3; struct csiphy_reg_t mipi_csiphy_2ph_lnck_ctrl3;
struct csiphy_reg_t mipi_csiphy_2ph_lnn_ctrl14; struct csiphy_reg_t mipi_csiphy_2ph_lnn_ctrl14;
struct csiphy_reg_t mipi_csiphy_3ph_cmn_ctrl7_cphy; struct csiphy_reg_t mipi_csiphy_3ph_cmn_ctrl7_cphy;
struct csiphy_reg_t mipi_csiphy_2ph_lnck_ctrl0;
}; };
struct csiphy_ctrl_t { struct csiphy_ctrl_t {