Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-19 17:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: smiapp: Use CCS limits in reading binning capabilities

Browse Source 
Use CCS limits for obtaining binning capabilities and subtypes.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Sakari Ailus 2020-02-11 10:37:47 +01:00 committed by Mauro Carvalho Chehab
parent 642d7c3eaf
commit 19a435f9ea
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/i2c/smiapp/smiapp-core.c
View File

@ -3105,26 +3105,17 @@ static int smiapp_probe(struct i2c_client *client)
}
if (CCS_LIM(sensor, BINNING_CAPABILITY)) {
u32 val;
rval = smiapp_read(sensor,
SMIAPP_REG_U8_BINNING_SUBTYPES, &val);
if (rval < 0) {
rval = -ENODEV;
goto out_free_ccs_limits;
}
sensor->nbinning_subtypes = min_t(u8, val,
SMIAPP_BINNING_SUBTYPES);
sensor->nbinning_subtypes =
min_t(u8, CCS_LIM(sensor, BINNING_SUB_TYPES),
CCS_LIM_BINNING_SUB_TYPE_MAX_N);
for (i = 0; i < sensor->nbinning_subtypes; i++) {
rval = smiapp_read(
sensor, SMIAPP_REG_U8_BINNING_TYPE_n(i), &val);
if (rval < 0) {
rval = -ENODEV;
goto out_free_ccs_limits;
}
sensor->binning_subtypes[i] =
*(struct smiapp_binning_subtype *)&val;
sensor->binning_subtypes[i].horizontal =
CCS_LIM_AT(sensor, BINNING_SUB_TYPE, i) >>
CCS_BINNING_SUB_TYPE_COLUMN_SHIFT;
sensor->binning_subtypes[i].vertical =
CCS_LIM_AT(sensor, BINNING_SUB_TYPE, i) &
CCS_BINNING_SUB_TYPE_ROW_MASK;
dev_dbg(&client->dev, "binning %xx%x\n",
sensor->binning_subtypes[i].horizontal,