| Message ID | 1452539418-28480-2-git-send-email-ykaneko0929@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hello Kaneko-san, On Tue, 12 Jan 2016, Yoshihiro Kaneko wrote: > Add fallback compatibility string for R-Car Gen2 and Gen3, This is > in keeping with the fallback scheme being adopted wherever appropriate > for drivers for Renesas SoCs. > > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> > --- Have you seen this patch: http://git.linuxtv.org/gliakhovetski/v4l-dvb.git/commit/?h=for-4.6-1&id=8e7825d38bbfcf8af8b0422c88f5e22701d89786 that I pushed yesterday? Is it wrong then? Do we have to cancel it, if Mauro hasn't pulled it yet? Or would you like to rebase and work on top of it? Thanks Guennadi > > v2 [Yoshihiro Kaneko] > * As suggested by Geert Uytterhoeven > drivers/media/platform/soc_camera/rcar_vin.c: > - The generic compatibility values are listed at the end of the > rcar_vin_of_table[]. > > Documentation/devicetree/bindings/media/rcar_vin.txt | 8 +++++++- > drivers/media/platform/soc_camera/rcar_vin.c | 3 +++ > 2 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt > index 9dafe6b..c13ec5a 100644 > --- a/Documentation/devicetree/bindings/media/rcar_vin.txt > +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt > @@ -6,12 +6,18 @@ family of devices. The current blocks are always slaves and suppot one input > channel which can be either RGB, YUYV or BT656. > > - compatible: Must be one of the following > + - "renesas,rcar-gen2-vin" for R-Car Gen2 Series > + - "renesas,rcar-gen3-vin" for R-Car Gen3 Series > - "renesas,vin-r8a7794" for the R8A7794 device > - "renesas,vin-r8a7793" for the R8A7793 device > - "renesas,vin-r8a7791" for the R8A7791 device > - "renesas,vin-r8a7790" for the R8A7790 device > - "renesas,vin-r8a7779" for the R8A7779 device > - "renesas,vin-r8a7778" for the R8A7778 device > + > + When compatible with the generic version, nodes must list the SoC-specific > + version corresponding to the platform first followed by the generic version. > + > - reg: the register base and size for the device registers > - interrupts: the interrupt for the device > - clocks: Reference to the parent clock > @@ -36,7 +42,7 @@ Device node example > }; > > vin0: vin@0xe6ef0000 { > - compatible = "renesas,vin-r8a7790"; > + compatible = "renesas,vin-r8a7790","renesas,rcar-gen2-vin"; > clocks = <&mstp8_clks R8A7790_CLK_VIN0>; > reg = <0 0xe6ef0000 0 0x1000>; > interrupts = <0 188 IRQ_TYPE_LEVEL_HIGH>; > diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c > index b7fd695..f72de0b 100644 > --- a/drivers/media/platform/soc_camera/rcar_vin.c > +++ b/drivers/media/platform/soc_camera/rcar_vin.c > @@ -143,6 +143,7 @@ > #define RCAR_VIN_BT656 (1 << 3) > > enum chip_id { > + RCAR_GEN3, > RCAR_GEN2, > RCAR_H1, > RCAR_M1, > @@ -1824,6 +1825,8 @@ static const struct of_device_id rcar_vin_of_table[] = { > { .compatible = "renesas,vin-r8a7790", .data = (void *)RCAR_GEN2 }, > { .compatible = "renesas,vin-r8a7779", .data = (void *)RCAR_H1 }, > { .compatible = "renesas,vin-r8a7778", .data = (void *)RCAR_M1 }, > + { .compatible = "renesas,rcar-gen2-vin", .data = (void *)RCAR_GEN2 }, > + { .compatible = "renesas,rcar-gen3-vin", .data = (void *)RCAR_GEN3 }, > { }, > }; > MODULE_DEVICE_TABLE(of, rcar_vin_of_table); > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Guennadi, On Mon, Jan 11, 2016 at 10:13:30PM +0100, Guennadi Liakhovetski wrote: > Hello Kaneko-san, > > On Tue, 12 Jan 2016, Yoshihiro Kaneko wrote: > > > Add fallback compatibility string for R-Car Gen2 and Gen3, This is > > in keeping with the fallback scheme being adopted wherever appropriate > > for drivers for Renesas SoCs. > > > > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> > > --- > > Have you seen this patch: > > http://git.linuxtv.org/gliakhovetski/v4l-dvb.git/commit/?h=for-4.6-1&id=8e7825d38bbfcf8af8b0422c88f5e22701d89786 > > that I pushed yesterday? Is it wrong then? Do we have to cancel it, if > Mauro hasn't pulled it yet? Or would you like to rebase and work on top of > it? Sorry about this. There are multiple threads of execution going on regarding enhancing drivers used by Renesas SoCs and sometimes things get a little mixed up: this is one of those times. My opinion is that the patch at the URL above is fine and that it would be best for Kaneko-san to rebase his work on top of it. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt index 9dafe6b..c13ec5a 100644 --- a/Documentation/devicetree/bindings/media/rcar_vin.txt +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt @@ -6,12 +6,18 @@ family of devices. The current blocks are always slaves and suppot one input channel which can be either RGB, YUYV or BT656. - compatible: Must be one of the following + - "renesas,rcar-gen2-vin" for R-Car Gen2 Series + - "renesas,rcar-gen3-vin" for R-Car Gen3 Series - "renesas,vin-r8a7794" for the R8A7794 device - "renesas,vin-r8a7793" for the R8A7793 device - "renesas,vin-r8a7791" for the R8A7791 device - "renesas,vin-r8a7790" for the R8A7790 device - "renesas,vin-r8a7779" for the R8A7779 device - "renesas,vin-r8a7778" for the R8A7778 device + + When compatible with the generic version, nodes must list the SoC-specific + version corresponding to the platform first followed by the generic version. + - reg: the register base and size for the device registers - interrupts: the interrupt for the device - clocks: Reference to the parent clock @@ -36,7 +42,7 @@ Device node example }; vin0: vin@0xe6ef0000 { - compatible = "renesas,vin-r8a7790"; + compatible = "renesas,vin-r8a7790","renesas,rcar-gen2-vin"; clocks = <&mstp8_clks R8A7790_CLK_VIN0>; reg = <0 0xe6ef0000 0 0x1000>; interrupts = <0 188 IRQ_TYPE_LEVEL_HIGH>; diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index b7fd695..f72de0b 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -143,6 +143,7 @@ #define RCAR_VIN_BT656 (1 << 3) enum chip_id { + RCAR_GEN3, RCAR_GEN2, RCAR_H1, RCAR_M1, @@ -1824,6 +1825,8 @@ static const struct of_device_id rcar_vin_of_table[] = { { .compatible = "renesas,vin-r8a7790", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7779", .data = (void *)RCAR_H1 }, { .compatible = "renesas,vin-r8a7778", .data = (void *)RCAR_M1 }, + { .compatible = "renesas,rcar-gen2-vin", .data = (void *)RCAR_GEN2 }, + { .compatible = "renesas,rcar-gen3-vin", .data = (void *)RCAR_GEN3 }, { }, }; MODULE_DEVICE_TABLE(of, rcar_vin_of_table);
Add fallback compatibility string for R-Car Gen2 and Gen3, This is in keeping with the fallback scheme being adopted wherever appropriate for drivers for Renesas SoCs. Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> --- v2 [Yoshihiro Kaneko] * As suggested by Geert Uytterhoeven drivers/media/platform/soc_camera/rcar_vin.c: - The generic compatibility values are listed at the end of the rcar_vin_of_table[]. Documentation/devicetree/bindings/media/rcar_vin.txt | 8 +++++++- drivers/media/platform/soc_camera/rcar_vin.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-)