[v2] media: rcar-csi2: Enable support for r8a77961

Commit Message

Niklas Söderlund May 13, 2021, 2:09 p.m. UTC

Enable support for M3-W+ (r8a77961).

Signed-off-by: Niklas Söderlund <[e-mail]>
Tested-by: LUU HOAI <[e-mail]>
---
* Changes since v1
- Do not piggy back on the M3-W (r8a7796) quirks as they are different.
---
 drivers/media/platform/rcar-vin/rcar-csi2.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Geert Uytterhoeven May 17, 2021, 9:51 a.m. UTC | #1

Hi Niklas,

On Thu, May 13, 2021 at 4:10 PM Niklas Söderlund
<[e-mail]> wrote:
> Enable support for M3-W+ (r8a77961).
>
> Signed-off-by: Niklas Söderlund <[e-mail]>
> Tested-by: LUU HOAI <[e-mail]>

Reviewed-by: Geert Uytterhoeven <[e-mail]>

> ---
> * Changes since v1
> - Do not piggy back on the M3-W (r8a7796) quirks as they are different.

But for now they're still handled the same way...

> --- a/drivers/media/platform/rcar-vin/rcar-csi2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c
> @@ -1112,6 +1112,11 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a7796 = {
>         .num_channels = 4,
>  };
>
> +static const struct rcar_csi2_info rcar_csi2_info_r8a77961 = {
> +       .hsfreqrange = hsfreqrange_m3w_h3es1,
> +       .num_channels = 4,
> +};

... as rcar_csi2_info_r8a77961 has the same contents as rcar_csi2_info_r8a7796?

Gr{oetje,eeting}s,

                        Geert

Niklas Söderlund May 17, 2021, 11:44 a.m. UTC | #2

Hi Geert,

On 2021-05-17 11:51:48 +0200, Geert Uytterhoeven wrote:
> Hi Niklas,
> 
> On Thu, May 13, 2021 at 4:10 PM Niklas Söderlund
> <[e-mail]> wrote:
> > Enable support for M3-W+ (r8a77961).
> >
> > Signed-off-by: Niklas Söderlund <[e-mail]>
> > Tested-by: LUU HOAI <[e-mail]>
> 
> Reviewed-by: Geert Uytterhoeven <[e-mail]>
> 
> > ---
> > * Changes since v1
> > - Do not piggy back on the M3-W (r8a7796) quirks as they are different.
> 
> But for now they're still handled the same way...
> 
> > --- a/drivers/media/platform/rcar-vin/rcar-csi2.c
> > +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c
> > @@ -1112,6 +1112,11 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a7796 = {
> >         .num_channels = 4,
> >  };
> >
> > +static const struct rcar_csi2_info rcar_csi2_info_r8a77961 = {
> > +       .hsfreqrange = hsfreqrange_m3w_h3es1,
> > +       .num_channels = 4,
> > +};
> 
> ... as rcar_csi2_info_r8a77961 has the same contents as rcar_csi2_info_r8a7796?

Yes the structures are currently the same but the one added here is 
correct while rcar_csi2_info_r8a7796 will need a new qurik field added 
in a different patch.

> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> -- 
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [e-mail]
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

Patch

diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c
index e06cd512aba207a4..a59113cd46db0380 100644
--- a/drivers/media/platform/rcar-vin/rcar-csi2.c
+++ b/drivers/media/platform/rcar-vin/rcar-csi2.c
@@ -1112,6 +1112,11 @@  static const struct rcar_csi2_info rcar_csi2_info_r8a7796 = {
 	.num_channels = 4,
 };
 
+static const struct rcar_csi2_info rcar_csi2_info_r8a77961 = {
+	.hsfreqrange = hsfreqrange_m3w_h3es1,
+	.num_channels = 4,
+};
+
 static const struct rcar_csi2_info rcar_csi2_info_r8a77965 = {
 	.init_phtw = rcsi2_init_phtw_h3_v3h_m3n,
 	.hsfreqrange = hsfreqrange_h3_v3h_m3n,
@@ -1164,6 +1169,10 @@  static const struct of_device_id rcar_csi2_of_table[] = {
 		.compatible = "renesas,r8a7796-csi2",
 		.data = &rcar_csi2_info_r8a7796,
 	},
+	{
+		.compatible = "renesas,r8a77961-csi2",
+		.data = &rcar_csi2_info_r8a77961,
+	},
 	{
 		.compatible = "renesas,r8a77965-csi2",
 		.data = &rcar_csi2_info_r8a77965,