media: atmel: atmel-isc: create product specific v4l2 controls config
Create product specific callback for initializing v4l2 controls. Call this from v4l2 controls init function. [hverkuil: made isc_sama5d2_config_ctrls static] Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Родитель
2873f85bd3
Коммит
8f1b451c87
|
@ -2051,11 +2051,12 @@ static int isc_ctrl_init(struct isc_device *isc)
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
/* Initialize product specific controls. For example, contrast */
|
||||||
|
isc->config_ctrls(isc, ops);
|
||||||
|
|
||||||
ctrls->brightness = 0;
|
ctrls->brightness = 0;
|
||||||
ctrls->contrast = 256;
|
|
||||||
|
|
||||||
v4l2_ctrl_new_std(hdl, ops, V4L2_CID_BRIGHTNESS, -1024, 1023, 1, 0);
|
v4l2_ctrl_new_std(hdl, ops, V4L2_CID_BRIGHTNESS, -1024, 1023, 1, 0);
|
||||||
v4l2_ctrl_new_std(hdl, ops, V4L2_CID_CONTRAST, -2048, 2047, 1, 256);
|
|
||||||
v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAMMA, 0, isc->gamma_max, 1,
|
v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAMMA, 0, isc->gamma_max, 1,
|
||||||
isc->gamma_max);
|
isc->gamma_max);
|
||||||
isc->awb_ctrl = v4l2_ctrl_new_std(hdl, &isc_awb_ops,
|
isc->awb_ctrl = v4l2_ctrl_new_std(hdl, &isc_awb_ops,
|
||||||
|
|
|
@ -227,6 +227,8 @@ struct isc_reg_offsets {
|
||||||
* specific CBC module
|
* specific CBC module
|
||||||
* @config_cc: pointer to a function that initializes product
|
* @config_cc: pointer to a function that initializes product
|
||||||
* specific CC module
|
* specific CC module
|
||||||
|
* @config_ctrls: pointer to a functoin that initializes product
|
||||||
|
* specific v4l2 controls.
|
||||||
*
|
*
|
||||||
* @offsets: struct holding the product specific register offsets
|
* @offsets: struct holding the product specific register offsets
|
||||||
*/
|
*/
|
||||||
|
@ -301,6 +303,9 @@ struct isc_device {
|
||||||
void (*config_csc)(struct isc_device *isc);
|
void (*config_csc)(struct isc_device *isc);
|
||||||
void (*config_cbc)(struct isc_device *isc);
|
void (*config_cbc)(struct isc_device *isc);
|
||||||
void (*config_cc)(struct isc_device *isc);
|
void (*config_cc)(struct isc_device *isc);
|
||||||
|
|
||||||
|
void (*config_ctrls)(struct isc_device *isc,
|
||||||
|
const struct v4l2_ctrl_ops *ops);
|
||||||
};
|
};
|
||||||
|
|
||||||
struct isc_reg_offsets offsets;
|
struct isc_reg_offsets offsets;
|
||||||
|
|
|
@ -96,6 +96,17 @@ static void isc_sama5d2_config_cc(struct isc_device *isc)
|
||||||
regmap_write(regmap, ISC_CC_BB_OB, (1 << 8));
|
regmap_write(regmap, ISC_CC_BB_OB, (1 << 8));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void isc_sama5d2_config_ctrls(struct isc_device *isc,
|
||||||
|
const struct v4l2_ctrl_ops *ops)
|
||||||
|
{
|
||||||
|
struct isc_ctrls *ctrls = &isc->ctrls;
|
||||||
|
struct v4l2_ctrl_handler *hdl = &ctrls->handler;
|
||||||
|
|
||||||
|
ctrls->contrast = 256;
|
||||||
|
|
||||||
|
v4l2_ctrl_new_std(hdl, ops, V4L2_CID_CONTRAST, -2048, 2047, 1, 256);
|
||||||
|
}
|
||||||
|
|
||||||
/* Gamma table with gamma 1/2.2 */
|
/* Gamma table with gamma 1/2.2 */
|
||||||
static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
|
static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
|
||||||
/* 0 --> gamma 1/1.8 */
|
/* 0 --> gamma 1/1.8 */
|
||||||
|
@ -244,6 +255,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
|
||||||
isc->config_csc = isc_sama5d2_config_csc;
|
isc->config_csc = isc_sama5d2_config_csc;
|
||||||
isc->config_cbc = isc_sama5d2_config_cbc;
|
isc->config_cbc = isc_sama5d2_config_cbc;
|
||||||
isc->config_cc = isc_sama5d2_config_cc;
|
isc->config_cc = isc_sama5d2_config_cc;
|
||||||
|
isc->config_ctrls = isc_sama5d2_config_ctrls;
|
||||||
|
|
||||||
isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
|
isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
|
||||||
isc->offsets.cbc = ISC_SAMA5D2_CBC_OFFSET;
|
isc->offsets.cbc = ISC_SAMA5D2_CBC_OFFSET;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче