| Message ID | 1452535211-4869-2-git-send-email-ykaneko0929@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Kaneko-san, On Mon, Jan 11, 2016 at 7:00 PM, Yoshihiro Kaneko <ykaneko0929@gmail.com> wrote: > --- 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, > @@ -1818,6 +1819,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { > > #ifdef CONFIG_OF > static const struct of_device_id rcar_vin_of_table[] = { > + { .compatible = "renesas,rcar-gen2-vin", .data = (void *)RCAR_GEN2 }, > + { .compatible = "renesas,rcar-gen3-vin", .data = (void *)RCAR_GEN3 }, Please add the generic compatible values at the end of the list, so SoC-specific ones take precedence. > { .compatible = "renesas,vin-r8a7794", .data = (void *)RCAR_GEN2 }, > { .compatible = "renesas,vin-r8a7793", .data = (void *)RCAR_GEN2 }, > { .compatible = "renesas,vin-r8a7791", .data = (void *)RCAR_GEN2 }, 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
Hi Geert-san, 2016-01-12 3:19 GMT+09:00 Geert Uytterhoeven <geert@linux-m68k.org>: > Hi Kaneko-san, > > On Mon, Jan 11, 2016 at 7:00 PM, Yoshihiro Kaneko <ykaneko0929@gmail.com> wrote: >> --- 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, >> @@ -1818,6 +1819,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { >> >> #ifdef CONFIG_OF >> static const struct of_device_id rcar_vin_of_table[] = { >> + { .compatible = "renesas,rcar-gen2-vin", .data = (void *)RCAR_GEN2 }, >> + { .compatible = "renesas,rcar-gen3-vin", .data = (void *)RCAR_GEN3 }, > > Please add the generic compatible values at the end of the list, so SoC-specific > ones take precedence. Oh, that makes sense. I will fix it soon. Thanks, kaneko > >> { .compatible = "renesas,vin-r8a7794", .data = (void *)RCAR_GEN2 }, >> { .compatible = "renesas,vin-r8a7793", .data = (void *)RCAR_GEN2 }, >> { .compatible = "renesas,vin-r8a7791", .data = (void *)RCAR_GEN2 }, > > 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 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..cccd859 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, @@ -1818,6 +1819,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { #ifdef CONFIG_OF static const struct of_device_id rcar_vin_of_table[] = { + { .compatible = "renesas,rcar-gen2-vin", .data = (void *)RCAR_GEN2 }, + { .compatible = "renesas,rcar-gen3-vin", .data = (void *)RCAR_GEN3 }, { .compatible = "renesas,vin-r8a7794", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7793", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7791", .data = (void *)RCAR_GEN2 },
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> --- Documentation/devicetree/bindings/media/rcar_vin.txt | 8 +++++++- drivers/media/platform/soc_camera/rcar_vin.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-)