lkml.org 
[lkml]   [2021]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/30] media: atmel: atmel-isc: create product specific v4l2 controls config
    Date
    Create product specific callback for initializing v4l2 controls.
    Call this from v4l2 controls init function.

    Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
    ---
    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 182903803c05..69952b6ac401 100644
    --- a/drivers/media/platform/atmel/atmel-isc-base.c
    +++ b/drivers/media/platform/atmel/atmel-isc-base.c
    @@ -2036,11 +2036,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 a5f8d5001381..eb549fadb1a8 100644
    --- a/drivers/media/platform/atmel/atmel-isc.h
    +++ b/drivers/media/platform/atmel/atmel-isc.h
    @@ -227,6 +227,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
    */
    @@ -301,6 +303,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 917d10baa525..a8375961f97d 100644
    --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
    +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
    @@ -96,6 +96,17 @@ void isc_sama5d2_config_cc(struct isc_device *isc)
    regmap_write(regmap, ISC_CC_BB_OB, (1 << 8));
    }

    +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 */
    const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
    /* 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_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.25.1
    \
     
     \ /
      Last update: 2021-04-01 20:28    [W:2.177 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site