| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495 |
- From 0a75c502eac4f2ef71b6c3e0b3a01db1b3c37ba9 Mon Sep 17 00:00:00 2001
- From: Eugen Hristev <[email protected]>
- Date: Tue, 13 Apr 2021 12:57:18 +0200
- Subject: [PATCH 176/247] 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 <[email protected]>
- Signed-off-by: Hans Verkuil <[email protected]>
- Signed-off-by: Mauro Carvalho Chehab <[email protected]>
- ---
- drivers/media/platform/atmel/atmel-isc-base.c | 5 +++--
- drivers/media/platform/atmel/atmel-isc.h | 5 +++++
- drivers/media/platform/atmel/atmel-sama5d2-isc.c | 12 ++++++++++++
- 3 files changed, 20 insertions(+), 2 deletions(-)
- diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
- index ffce8de2cf4d..8ed8b8a4840c 100644
- --- a/drivers/media/platform/atmel/atmel-isc-base.c
- +++ b/drivers/media/platform/atmel/atmel-isc-base.c
- @@ -2051,11 +2051,12 @@ static int isc_ctrl_init(struct isc_device *isc)
- if (ret < 0)
- return ret;
-
- + /* Initialize product specific controls. For example, contrast */
- + isc->config_ctrls(isc, ops);
- +
- 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_CONTRAST, -2048, 2047, 1, 256);
- v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAMMA, 0, isc->gamma_max, 1,
- isc->gamma_max);
- isc->awb_ctrl = v4l2_ctrl_new_std(hdl, &isc_awb_ops,
- diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
- index 293746664cef..428419d5a07d 100644
- --- a/drivers/media/platform/atmel/atmel-isc.h
- +++ b/drivers/media/platform/atmel/atmel-isc.h
- @@ -226,6 +226,8 @@ struct isc_reg_offsets {
- * specific CBC module
- * @config_cc: pointer to a function that initializes product
- * specific CC module
- + * @config_ctrls: pointer to a functoin that initializes product
- + * specific v4l2 controls.
- *
- * @offsets: struct holding the product specific register offsets
- */
- @@ -300,6 +302,9 @@ struct isc_device {
- void (*config_csc)(struct isc_device *isc);
- void (*config_cbc)(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;
- diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
- index 903920b74965..7512012cd9f3 100644
- --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
- +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
- @@ -96,6 +96,17 @@ static void isc_sama5d2_config_cc(struct isc_device *isc)
- 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 */
- static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
- /* 0 --> gamma 1/1.8 */
- @@ -265,6 +276,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
- isc->config_csc = isc_sama5d2_config_csc;
- isc->config_cbc = isc_sama5d2_config_cbc;
- isc->config_cc = isc_sama5d2_config_cc;
- + isc->config_ctrls = isc_sama5d2_config_ctrls;
-
- isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
- isc->offsets.cbc = ISC_SAMA5D2_CBC_OFFSET;
- --
- 2.32.0
|
