dchvs
/
li-mt9m021
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix identation

This commit is contained in:
dchvs 2021-03-29 08:53:54 -06:00
parent 6f6cbd2465
commit 855ce6a4d5
3 changed files with 218 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/nvidia-spiri/drivers/media/i2c/mt9m021.c
View File

@ -442,12 +442,10 @@ static int mt9m021_set_gain(struct tegracam_device *tc_dev, s64 val)
goto exit; goto exit;
/* Update global gain */ /* Update global gain */
err = err = mt9m021_write_reg16(s_data, MT9M021_GLOBAL_GAIN, gain);
mt9m021_write_reg16(s_data, MT9M021_GLOBAL_GAIN, gain);
if (err) if (err)
goto exit; goto exit;
err = err = mt9m021_write_reg16(s_data, MT9M021_GLOBAL_GAIN_CB, gain);
mt9m021_write_reg16(s_data, MT9M021_GLOBAL_GAIN_CB, gain);
if (err) if (err)
goto exit; goto exit;
@ -564,8 +562,7 @@ static int mt9m021_set_analog_gain(struct tegracam_device *tc_dev, s64 val)
goto exit; goto exit;
reg16 = reg16 =
(reg16 & ~MT9M021_ANALOG_GAIN_MASK) | (reg16 & ~MT9M021_ANALOG_GAIN_MASK) |
((val << MT9M021_ANALOG_GAIN_SHIFT) & ((val << MT9M021_ANALOG_GAIN_SHIFT) & MT9M021_ANALOG_GAIN_MASK);
MT9M021_ANALOG_GAIN_MASK);
err = mt9m021_write_reg16(s_data, MT9M021_DIGITAL_TEST, reg16); err = mt9m021_write_reg16(s_data, MT9M021_DIGITAL_TEST, reg16);
if (err) if (err)
goto exit; goto exit;
@ -642,8 +639,7 @@ static int mt9m021_set_test_pattern(struct tegracam_device *tc_dev, s32 val)
err = mt9m021_write_reg16(s_data, MT9M021_TEST_PATTERN, err = mt9m021_write_reg16(s_data, MT9M021_TEST_PATTERN,
MT9M021_TEST_PATTERN_VAL); MT9M021_TEST_PATTERN_VAL);
else else
err = mt9m021_write_reg16(s_data, MT9M021_TEST_PATTERN, err = mt9m021_write_reg16(s_data, MT9M021_TEST_PATTERN, val);
val);
if (err) if (err)
goto exit; goto exit;
@ -1116,7 +1112,8 @@ static int mt9m021_verify_chip_id(struct mt9m021 *priv)
err = mt9m021_read_reg16(s_data, MT9M021_CHIP_ID_REG, &chip_id); err = mt9m021_read_reg16(s_data, MT9M021_CHIP_ID_REG, &chip_id);
if (!err) if (!err)
break; break;
dev_info(&client->dev, "Failed to read Chip ID, trying again\n"); dev_info(&client->dev,
"Failed to read Chip ID, trying again\n");
max_retries--; max_retries--;
msleep(30); msleep(30);
} }

6
kernel/nvidia-spiri/drivers/media/i2c/mt9m021_mode_tbls.h
View File

@ -173,8 +173,10 @@ static const int mt9m021_framerates_1280x960[] = {
}; };
static const struct camera_common_frmfmt mt9m021_frmfmt[] = { static const struct camera_common_frmfmt mt9m021_frmfmt[] = {
{{1280, 720}, mt9m021_framerates_1280x720, 1, 0, MT9M021_MODE_1280x720_60FPS}, {{1280, 720}, mt9m021_framerates_1280x720, 1, 0,
{{1280, 960}, mt9m021_framerates_1280x960, 1, 0, MT9M021_MODE_1280x960_45FPS}, MT9M021_MODE_1280x720_60FPS},
{{1280, 960}, mt9m021_framerates_1280x960, 1, 0,
MT9M021_MODE_1280x960_45FPS},
}; };
#endif /* __MT9M021_I2C_TABLES__ */ #endif /* __MT9M021_I2C_TABLES__ */