| Message ID | 1452707918-4321-1-git-send-email-ykaneko0929@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Kaneko-san, On Thu, 14 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> > --- > > This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree. > > v3 [Yoshihiro Kaneko] > * rebased to for-4.6-1 branch of Guennadi's tree. > > 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 | 2 ++ I might be wrong in this specific case, please, correct me someone, but doesn't Documentation/devicetree/bindings/submitting-patches.txt tell us to submit bindings patches separately from the drivers part? Thanks Guennadi > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt > index 619193c..e1a92c9 100644 > --- a/Documentation/devicetree/bindings/media/rcar_vin.txt > +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt > @@ -6,6 +6,8 @@ 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-r8a7795" for the R8A7795 device > - "renesas,vin-r8a7794" for the R8A7794 device > - "renesas,vin-r8a7793" for the R8A7793 device > @@ -13,6 +15,10 @@ channel which can be either RGB, YUYV or BT656. > - "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 > @@ -37,7 +43,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 dc75a80..b72a048 100644 > --- a/drivers/media/platform/soc_camera/rcar_vin.c > +++ b/drivers/media/platform/soc_camera/rcar_vin.c > @@ -1826,6 +1826,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 Sat, Jan 23, 2016 at 6:37 PM, Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote: > On Thu, 14 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> >> --- >> >> This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree. >> >> v3 [Yoshihiro Kaneko] >> * rebased to for-4.6-1 branch of Guennadi's tree. >> >> 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 | 2 ++ > > I might be wrong in this specific case, please, correct me someone, but > doesn't Documentation/devicetree/bindings/submitting-patches.txt tell us > to submit bindings patches separately from the drivers part? I think that mostly applies to new bindings and new drivers. For small updates (e.g. adding a new compatible value), these tend to be submitted as a single patch. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org 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 -- 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 619193c..e1a92c9 100644 --- a/Documentation/devicetree/bindings/media/rcar_vin.txt +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt @@ -6,6 +6,8 @@ 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-r8a7795" for the R8A7795 device - "renesas,vin-r8a7794" for the R8A7794 device - "renesas,vin-r8a7793" for the R8A7793 device @@ -13,6 +15,10 @@ channel which can be either RGB, YUYV or BT656. - "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 @@ -37,7 +43,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 dc75a80..b72a048 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -1826,6 +1826,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> --- This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree. v3 [Yoshihiro Kaneko] * rebased to for-4.6-1 branch of Guennadi's tree. 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 | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-)