From: "Jernej Škrabec" <jernej.skrabec@gmail.com>
To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cc: Yong Deng <yong.deng@magewell.com>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Chen-Yu Tsai <wens@csie.org>,
Samuel Holland <samuel@sholland.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: Re: [PATCH v3 06/46] media: sun6i-csi: Define and use variant to get module clock rate
Date: Tue, 15 Mar 2022 20:31:13 +0100 [thread overview]
Message-ID: <2060330.OBFZWjSADL@kista> (raw)
In-Reply-To: <20220311143532.265091-7-paul.kocialkowski@bootlin.com>
Dne petek, 11. marec 2022 ob 15:34:52 CET je Paul Kocialkowski napisal(a):
> 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>
> ---
> .../platform/sunxi/sun6i-csi/sun6i_csi.c | 48 ++++++++++++++-----
> .../platform/sunxi/sun6i-csi/sun6i_csi.h | 4 ++
> 2 files changed, 40 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 2355088fdc37..4a0d08e0ac25 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
> @@ -811,11 +811,17 @@ 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 clk_mod_rate;
> + const struct sun6i_csi_variant *variant;
Ideally, this should be sorted from longest to shortest.
> void __iomem *io_base;
> int ret;
> int irq;
>
> + /* Variant */
I don't think this comment is very useful (nor one below for that matter.)
Please remove it.
With that:
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Best regards,
Jernej
> +
> + variant = of_device_get_match_data(dev);
> + if (!variant)
> + return -EINVAL;
> +
> /* Registers */
>
> io_base = devm_platform_ioremap_resource(platform_dev, 0);
> @@ -849,12 +855,7 @@ static int sun6i_csi_resources_setup(struct
sun6i_csi_device *csi_dev,
> return PTR_ERR(csi_dev->clk_ram);
> }
>
> - if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64-
csi"))
> - clk_mod_rate = 300000000;
> - else
> - clk_mod_rate = 297000000;
> -
> - ret = clk_set_rate_exclusive(csi_dev->clk_mod, clk_mod_rate);
> + ret = clk_set_rate_exclusive(csi_dev->clk_mod, variant-
>clk_mod_rate);
> if (ret) {
> dev_err(dev, "failed to set mod clock rate\n");
> return ret;
> @@ -937,12 +938,35 @@ static int sun6i_csi_remove(struct platform_device
*pdev)
> return 0;
> }
>
> +static const struct sun6i_csi_variant sun6i_a31_csi_variant = {
> + .clk_mod_rate = 297000000,
> +};
> +
> +static const struct sun6i_csi_variant sun50i_a64_csi_variant = {
> + .clk_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 356661b413f8..3c4a3af6b897 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
> @@ -59,6 +59,10 @@ struct sun6i_csi_device {
> int planar_offset[3];
> };
>
> +struct sun6i_csi_variant {
> + unsigned long clk_mod_rate;
> +};
> +
> /**
> * sun6i_csi_is_format_supported() - check if the format supported by csi
> * @csi: pointer to the csi
> --
> 2.35.1
>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-03-15 19:32 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 14:34 [PATCH v3 00/46] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 01/46] media: sun6i-csi: Define and use driver name and (reworked) description Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 02/46] media: sun6i-csi: Refactor main driver data structures Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 03/46] media: sun6i-csi: Grab bus clock instead of passing it to regmap Paul Kocialkowski
2022-03-15 19:22 ` Jernej Škrabec
2022-03-18 8:49 ` Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 04/46] media: sun6i-csi: Tidy up platform code Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 05/46] media: sun6i-csi: Always set exclusive module clock rate Paul Kocialkowski
2022-03-15 19:27 ` Jernej Škrabec
2022-03-11 14:34 ` [PATCH v3 06/46] media: sun6i-csi: Define and use variant to get " Paul Kocialkowski
2022-03-15 19:31 ` Jernej Škrabec [this message]
2022-03-18 8:54 ` Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 07/46] media: sun6i-csi: Use runtime pm for clocks and reset Paul Kocialkowski
2022-03-15 19:46 ` Jernej Škrabec
2022-03-18 16:15 ` Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 08/46] media: sun6i-csi: Tidy up Kconfig Paul Kocialkowski
2022-03-15 19:51 ` Jernej Škrabec
2022-03-11 14:34 ` [PATCH v3 09/46] media: sun6i-csi: Tidy up v4l2 code Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 10/46] media: sun6i-csi: Tidy up video code Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 11/46] media: sun6i-csi: Pass and store csi device directly in " Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 12/46] media: sun6i-csi: Register the media device after creation Paul Kocialkowski
2022-03-11 14:34 ` [PATCH v3 13/46] media: sun6i-csi: Add media ops with link notify callback Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 14/46] media: sun6i-csi: Introduce and use video helper functions Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 15/46] media: sun6i-csi: Move csi buffer definition to main header file Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 16/46] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 17/46] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 18/46] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 19/46] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 20/46] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 21/46] media: sun6i-csi: Implement address configuration without indirection Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 22/46] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 23/46] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 24/46] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 25/46] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 26/46] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 27/46] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 28/46] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 29/46] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 30/46] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 31/46] media: sun6i-csi: Introduce capture " Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 32/46] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 33/46] media: sun6i-csi: Introduce format match structure, list and helper Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 34/46] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 35/46] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 36/46] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 37/46] media: sun6i-csi: Unset bridge source on capture streamon fail Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 38/46] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 39/46] media: sun6i-csi: Cleanup headers and includes, update copyright lines Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 40/46] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 41/46] media: sun6i-csi: Only configure capture when streaming Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 42/46] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 43/46] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 44/46] media: sun6i-csi: Detect the availability of the ISP Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 45/46] media: sun6i-csi: Add support for hooking to the isp devices Paul Kocialkowski
2022-03-11 14:35 ` [PATCH v3 46/46] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2060330.OBFZWjSADL@kista \
--to=jernej.skrabec@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=paul.kocialkowski@bootlin.com \
--cc=samuel@sholland.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=wens@csie.org \
--cc=yong.deng@magewell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).