sync(system): sync system changes.
This commit is contained in:
@@ -27,7 +27,8 @@
|
||||
#define SENSOR_NAME "gc2083_mipi"
|
||||
#define SENSOR_NAME_2 "gc2083_mipi_2"
|
||||
|
||||
#define GC2083_1920X1080_15FPS
|
||||
#define GC2083_1920X1088_15FPS
|
||||
//#define GC2083_1920X1088_20FPS
|
||||
#define SENSOR_FRAME_RATE 15
|
||||
|
||||
static int sensor_power_count[2];
|
||||
@@ -44,7 +45,7 @@ static struct regval_list sensor_default_regs[] = {
|
||||
};
|
||||
|
||||
#if defined CONFIG_ISP_READ_THRESHOLD || defined CONFIG_ISP_ONLY_HARD_LIGHTADC
|
||||
#ifdef GC2083_1920X1080_20FPS
|
||||
#ifdef GC2083_1920X1088_20FPS
|
||||
static struct regval_list sensor_1080p20_regs[] = {
|
||||
//version 1.0
|
||||
//mclk 27Mhz
|
||||
@@ -119,7 +120,7 @@ static struct regval_list sensor_1080p20_regs[] = {
|
||||
{0x008d, 0xff},
|
||||
|
||||
/*gain*/
|
||||
{0x007a, 0x78}, //global gain
|
||||
{0x007a, 0x50}, //global gain
|
||||
{0x00d0, 0x00},
|
||||
{0x0dc1, 0x00},
|
||||
|
||||
@@ -191,7 +192,7 @@ static struct regval_list sensor_1080p20_regs[] = {
|
||||
{0x0192, 0x00},
|
||||
{0x0194, 0x00},
|
||||
{0x0195, 0x04},
|
||||
{0x0196, 0x38},
|
||||
{0x0196, 0x40},
|
||||
{0x0197, 0x07},
|
||||
{0x0198, 0x80},
|
||||
|
||||
@@ -205,11 +206,11 @@ static struct regval_list sensor_1080p20_regs[] = {
|
||||
{0x0215, 0x10},
|
||||
{0x0229, 0x05},
|
||||
{0x0237, 0x03},
|
||||
// {0x023e, 0x99}
|
||||
{0x023e, 0x99}
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef GC2083_1920X1080_15FPS
|
||||
#ifdef GC2083_1920X1088_15FPS
|
||||
static struct regval_list sensor_1080p15_regs[] = {
|
||||
{0x03fe, 0xf0},
|
||||
{0x03fe, 0xf0},
|
||||
@@ -252,7 +253,7 @@ static struct regval_list sensor_1080p15_regs[] = {
|
||||
{0x0076, 0x00},
|
||||
{0x0d76, 0x00},
|
||||
{0x0d41, 0x05},
|
||||
{0x0d42, 0x8b},
|
||||
{0x0d42, 0x46},
|
||||
|
||||
{0x0d7a, 0x10},
|
||||
{0x0d19, 0x31},
|
||||
@@ -272,11 +273,11 @@ static struct regval_list sensor_1080p15_regs[] = {
|
||||
{0x0db6, 0x3d},
|
||||
{0x00d2, 0xbc},
|
||||
{0x0d66, 0x42},
|
||||
{0x008c, 0x06}, // dynamic range 0x05 -> 0x06
|
||||
{0x008c, 0x05},
|
||||
{0x008d, 0xff},
|
||||
|
||||
/*gain*/
|
||||
{0x007a, 0x98}, //global gain, orign = 0x50
|
||||
{0x007a, 0x50}, //global gain
|
||||
{0x00d0, 0x00},
|
||||
{0x0dc1, 0x00},
|
||||
|
||||
@@ -345,10 +346,10 @@ static struct regval_list sensor_1080p15_regs[] = {
|
||||
{0x04e0, 0x18},
|
||||
|
||||
/*window*/
|
||||
{0x0192, 0x04},
|
||||
{0x0192, 0x00},
|
||||
{0x0194, 0x04},
|
||||
{0x0195, 0x04},
|
||||
{0x0196, 0x38},
|
||||
{0x0196, 0x40},
|
||||
{0x0197, 0x07},
|
||||
{0x0198, 0x80},
|
||||
|
||||
@@ -362,7 +363,7 @@ static struct regval_list sensor_1080p15_regs[] = {
|
||||
{0x0215, 0x10},
|
||||
{0x0229, 0x05},
|
||||
{0x0237, 0x03},
|
||||
// {0x023e, 0x99}
|
||||
{0x023e, 0x99}
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -754,7 +755,7 @@ static struct sensor_format_struct sensor_formats[] = {
|
||||
{
|
||||
.mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, /*.mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, */
|
||||
.width = 1920,
|
||||
.height = 1080,
|
||||
.height = 1088,
|
||||
.hoffset = 0,
|
||||
.voffset = 0,
|
||||
.hts = 2932,
|
||||
@@ -774,21 +775,21 @@ static struct sensor_format_struct sensor_formats[] = {
|
||||
},
|
||||
#endif
|
||||
|
||||
#ifdef GC2083_1920X1080_15FPS
|
||||
#ifdef GC2083_1920X1088_15FPS
|
||||
{
|
||||
.mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, /*.mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, */
|
||||
.width = 1920,
|
||||
.height = 1080,
|
||||
.height = 1088,
|
||||
.hoffset = 0,
|
||||
.voffset = 0,
|
||||
.hts = 3140,
|
||||
.vts = 1419,
|
||||
.vts = 1350,
|
||||
.pclk = 63600000,
|
||||
.mipi_bps = 318 * 1000 * 1000,
|
||||
.fps_fixed = 15,
|
||||
.bin_factor = 1,
|
||||
.intg_min = 1 << 4,
|
||||
.intg_max = (1419 - 16) << 4,
|
||||
.intg_max = (1350 - 16) << 4,
|
||||
.gain_min = 1 << 4,
|
||||
.gain_max = 110 << 4,
|
||||
.offs_h = 0,
|
||||
@@ -882,7 +883,7 @@ static struct sensor_format_struct switch_sensor_formats[] = {
|
||||
{
|
||||
.mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10,
|
||||
.width = 1920,
|
||||
.height = 1080,
|
||||
.height = 1088,
|
||||
.hoffset = 0,
|
||||
.voffset = 0,
|
||||
.hts = 2932,
|
||||
|
||||
@@ -62,6 +62,9 @@ struct sensor_cfg_array sensor_array[] = {
|
||||
{"ov02b10_mipi", &ov02b10_core},
|
||||
{"ov02b1b_mipi", &ov02b10_core},
|
||||
#endif
|
||||
#ifdef CONFIG_SENSOR_GC2083_MIPI
|
||||
{"gc2083_mipi", &gc2083_core},
|
||||
#endif
|
||||
};
|
||||
|
||||
struct sensor_fuc_core *find_sensor_func(char *sensor_name)
|
||||
|
||||
Reference in New Issue
Block a user