lkml.org 
[lkml]   [2022]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 05/43] media: sun6i-csi: Define and use variant to get module clock rate
    Date
    Introduce a proper variant structure with the module clock rate
    instead of hardcoding it with a manual check on the compatible.

    Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
    Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
    ---
    .../platform/sunxi/sun6i-csi/sun6i_csi.c | 47 ++++++++++++++-----
    .../platform/sunxi/sun6i-csi/sun6i_csi.h | 4 ++
    2 files changed, 39 insertions(+), 12 deletions(-)

    diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
    index 89a15cd779ac..800851f4e18c 100644
    --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
    +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
    @@ -808,11 +808,15 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,
    struct platform_device *platform_dev)
    {
    struct device *dev = csi_dev->dev;
    - unsigned long clock_mod_rate;
    + const struct sun6i_csi_variant *variant;
    void __iomem *io_base;
    int ret;
    int irq;

    + variant = of_device_get_match_data(dev);
    + if (!variant)
    + return -EINVAL;
    +
    /* Registers */

    io_base = devm_platform_ioremap_resource(platform_dev, 0);
    @@ -840,12 +844,8 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,
    return PTR_ERR(csi_dev->clock_ram);
    }

    - if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64-csi"))
    - clock_mod_rate = 300000000;
    - else
    - clock_mod_rate = 297000000;
    -
    - ret = clk_set_rate_exclusive(csi_dev->clock_mod, clock_mod_rate);
    + ret = clk_set_rate_exclusive(csi_dev->clock_mod,
    + variant->clock_mod_rate);
    if (ret) {
    dev_err(dev, "failed to set mod clock rate\n");
    return ret;
    @@ -928,12 +928,35 @@ static int sun6i_csi_remove(struct platform_device *pdev)
    return 0;
    }

    +static const struct sun6i_csi_variant sun6i_a31_csi_variant = {
    + .clock_mod_rate = 297000000,
    +};
    +
    +static const struct sun6i_csi_variant sun50i_a64_csi_variant = {
    + .clock_mod_rate = 300000000,
    +};
    +
    static const struct of_device_id sun6i_csi_of_match[] = {
    - { .compatible = "allwinner,sun6i-a31-csi", },
    - { .compatible = "allwinner,sun8i-a83t-csi", },
    - { .compatible = "allwinner,sun8i-h3-csi", },
    - { .compatible = "allwinner,sun8i-v3s-csi", },
    - { .compatible = "allwinner,sun50i-a64-csi", },
    + {
    + .compatible = "allwinner,sun6i-a31-csi",
    + .data = &sun6i_a31_csi_variant,
    + },
    + {
    + .compatible = "allwinner,sun8i-a83t-csi",
    + .data = &sun6i_a31_csi_variant,
    + },
    + {
    + .compatible = "allwinner,sun8i-h3-csi",
    + .data = &sun6i_a31_csi_variant,
    + },
    + {
    + .compatible = "allwinner,sun8i-v3s-csi",
    + .data = &sun6i_a31_csi_variant,
    + },
    + {
    + .compatible = "allwinner,sun50i-a64-csi",
    + .data = &sun50i_a64_csi_variant,
    + },
    {},
    };

    diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
    index 945d0cb5ab39..a76b545f2aa4 100644
    --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
    +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
    @@ -58,6 +58,10 @@ struct sun6i_csi_device {
    int planar_offset[3];
    };

    +struct sun6i_csi_variant {
    + unsigned long clock_mod_rate;
    +};
    +
    /**
    * sun6i_csi_is_format_supported() - check if the format supported by csi
    * @csi: pointer to the csi
    --
    2.37.1
    \
     
     \ /
      Last update: 2022-08-26 20:34    [W:2.301 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site