Message ID | 1448955783-22806-2-git-send-email-horms+renesas@verge.net.au (mailing list archive) |
---|---|
State | Changes Requested |
Delegated to: | Simon Horman |
Headers | show |
On Tue, Dec 1, 2015 at 8:43 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > Add fallback compatibility strings for R-Car Gen 2 & 3 SoC Families. > This is in keeping with the fallback scheme being adopted wherever > appropriate for drivers for Renesas SoCs. > > Also correct typo. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > Documentation/devicetree/bindings/net/renesas,ravb.txt | 11 +++++++++-- > drivers/net/ethernet/renesas/ravb_main.c | 2 ++ > 2 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt > index b486f3f5f6a3..115006325bff 100644 > --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt > +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt > @@ -1,12 +1,19 @@ > * Renesas Electronics Ethernet AVB > > This file provides information on what the device node for the Ethernet AVB > -interface contains. > +interface. > > Required properties: > - compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. > "renesas,etheravb-r8a7794" if the device is a part of R8A7794 SoC. > "renesas,etheravb-r8a7795" if the device is a part of R8A7795 SoC. > + "renesas,etheravb-gen2" for generic R-Car Gen 2 compatible interface. > + "renesas,etheravb-gen3" for generic R-Car Gen 3 compatible interface. > + (Same comment, different audience) Shouldn't that be "renesas,etheravb-rcar-gen" or "renesas,etheravb-rcar2"? Else you'll be in trouble when Renesas starts focussing on airplanes (R-Plane Gen2), rockets (R-Rocket Gen2), or IoT (R-IoT 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
Hello. On 12/1/2015 10:43 AM, Simon Horman wrote: > Add fallback compatibility strings for R-Car Gen 2 & 3 SoC Families. > This is in keeping with the fallback scheme being adopted wherever > appropriate for drivers for Renesas SoCs. > > Also correct typo. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > Documentation/devicetree/bindings/net/renesas,ravb.txt | 11 +++++++++-- > drivers/net/ethernet/renesas/ravb_main.c | 2 ++ > 2 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt > index b486f3f5f6a3..115006325bff 100644 > --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt > +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt > @@ -1,12 +1,19 @@ > * Renesas Electronics Ethernet AVB > > This file provides information on what the device node for the Ethernet AVB > -interface contains. > +interface. Why? [...] MBR, Sergei -- 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
On Tue, Dec 01, 2015 at 01:26:08PM +0300, Sergei Shtylyov wrote: > Hello. > > On 12/1/2015 10:43 AM, Simon Horman wrote: > > >Add fallback compatibility strings for R-Car Gen 2 & 3 SoC Families. > >This is in keeping with the fallback scheme being adopted wherever > >appropriate for drivers for Renesas SoCs. > > > >Also correct typo. > > > >Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > >--- > > Documentation/devicetree/bindings/net/renesas,ravb.txt | 11 +++++++++-- > > drivers/net/ethernet/renesas/ravb_main.c | 2 ++ > > 2 files changed, 11 insertions(+), 2 deletions(-) > > > >diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt > >index b486f3f5f6a3..115006325bff 100644 > >--- a/Documentation/devicetree/bindings/net/renesas,ravb.txt > >+++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt > >@@ -1,12 +1,19 @@ > > * Renesas Electronics Ethernet AVB > > > > This file provides information on what the device node for the Ethernet AVB > >-interface contains. > >+interface. > > Why? Because I miss read it (multiple times). I'll drop this change. -- 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
On Tue, Dec 01, 2015 at 09:42:52AM +0100, Geert Uytterhoeven wrote: > On Tue, Dec 1, 2015 at 8:43 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > > Add fallback compatibility strings for R-Car Gen 2 & 3 SoC Families. > > This is in keeping with the fallback scheme being adopted wherever > > appropriate for drivers for Renesas SoCs. > > > > Also correct typo. > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > Documentation/devicetree/bindings/net/renesas,ravb.txt | 11 +++++++++-- > > drivers/net/ethernet/renesas/ravb_main.c | 2 ++ > > 2 files changed, 11 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt > > index b486f3f5f6a3..115006325bff 100644 > > --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt > > +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt > > @@ -1,12 +1,19 @@ > > * Renesas Electronics Ethernet AVB > > > > This file provides information on what the device node for the Ethernet AVB > > -interface contains. > > +interface. > > > > Required properties: > > - compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. > > "renesas,etheravb-r8a7794" if the device is a part of R8A7794 SoC. > > "renesas,etheravb-r8a7795" if the device is a part of R8A7795 SoC. > > + "renesas,etheravb-gen2" for generic R-Car Gen 2 compatible interface. > > + "renesas,etheravb-gen3" for generic R-Car Gen 3 compatible interface. > > + > > (Same comment, different audience) > > Shouldn't that be "renesas,etheravb-rcar-gen" or "renesas,etheravb-rcar2"? > > Else you'll be in trouble when Renesas starts focussing on airplanes > (R-Plane Gen2), rockets (R-Rocket Gen2), or IoT (R-IoT Gen2). Sure, lets go with: renesas,etheravb-rcar-gen2 and renesas,etheravb-rcar-gen3. -- 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/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt index b486f3f5f6a3..115006325bff 100644 --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt @@ -1,12 +1,19 @@ * Renesas Electronics Ethernet AVB This file provides information on what the device node for the Ethernet AVB -interface contains. +interface. Required properties: - compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. "renesas,etheravb-r8a7794" if the device is a part of R8A7794 SoC. "renesas,etheravb-r8a7795" if the device is a part of R8A7795 SoC. + "renesas,etheravb-gen2" for generic R-Car Gen 2 compatible interface. + "renesas,etheravb-gen3" for generic R-Car Gen 3 compatible interface. + + When compatible with the generic version, nodes must list the + SoC-specific version corresponding to the platform first + followed by the generic version. + - reg: offset and length of (1) the register block and (2) the stream buffer. - interrupts: A list of interrupt-specifiers, one for each entry in interrupt-names. @@ -37,7 +44,7 @@ Optional properties: Example: ethernet@e6800000 { - compatible = "renesas,etheravb-r8a7795"; + compatible = "renesas,etheravb-r8a7795", "renesas,etheravb-gen3"; reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>; interrupt-parent = <&gic>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>, diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 990dc55cdada..d3b4f574d346 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1656,7 +1656,9 @@ static int ravb_mdio_release(struct ravb_private *priv) static const struct of_device_id ravb_match_table[] = { { .compatible = "renesas,etheravb-r8a7790", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,etheravb-r8a7794", .data = (void *)RCAR_GEN2 }, + { .compatible = "renesas,etheravb-gen2", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,etheravb-r8a7795", .data = (void *)RCAR_GEN3 }, + { .compatible = "renesas,etheravb-gen3", .data = (void *)RCAR_GEN3 }, { } }; MODULE_DEVICE_TABLE(of, ravb_match_table);
Add fallback compatibility strings for R-Car Gen 2 & 3 SoC Families. This is in keeping with the fallback scheme being adopted wherever appropriate for drivers for Renesas SoCs. Also correct typo. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- Documentation/devicetree/bindings/net/renesas,ravb.txt | 11 +++++++++-- drivers/net/ethernet/renesas/ravb_main.c | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-)