[PATCH] dt-bindings: can: rcar_can: Add r8a7744 support
Document RZ/G1N (r8a7744) SoC specific bindings. Signed-off-by: Biju Das Reviewed-by: Chris Paterson --- This patch is tested against linux-next next-20180927 --- Documentation/devicetree/bindings/net/can/rcar_can.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/net/can/rcar_can.txt b/Documentation/devicetree/bindings/net/can/rcar_can.txt index 94a7f33..cc43728 100644 --- a/Documentation/devicetree/bindings/net/can/rcar_can.txt +++ b/Documentation/devicetree/bindings/net/can/rcar_can.txt @@ -3,6 +3,7 @@ Renesas R-Car CAN controller Device Tree Bindings Required properties: - compatible: "renesas,can-r8a7743" if CAN controller is a part of R8A7743 SoC. + "renesas,can-r8a7744" if CAN controller is a part of R8A7744 SoC. "renesas,can-r8a7745" if CAN controller is a part of R8A7745 SoC. "renesas,can-r8a7778" if CAN controller is a part of R8A7778 SoC. "renesas,can-r8a7779" if CAN controller is a part of R8A7779 SoC. -- 2.7.4
[PATCH net-next] dt-bindings: net: renesas-ravb: Add support for r8a77470 SoC
Add a new compatible string for the RZ/G1C (R8A77470) SoC. Signed-off-by: Biju Das <biju@bp.renesas.com> Reviewed-by: Fabrizio Castro <fabrizio.cas...@bp.renesas.com> --- Documentation/devicetree/bindings/net/renesas,ravb.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt index b4dc455..c306f55 100644 --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt @@ -7,6 +7,7 @@ Required properties: - compatible: Must contain one or more of the following: - "renesas,etheravb-r8a7743" for the R8A7743 SoC. - "renesas,etheravb-r8a7745" for the R8A7745 SoC. + - "renesas,etheravb-r8a77470" for the R8A77470 SoC. - "renesas,etheravb-r8a7790" for the R8A7790 SoC. - "renesas,etheravb-r8a7791" for the R8A7791 SoC. - "renesas,etheravb-r8a7792" for the R8A7792 SoC. -- 2.7.4
[PATCH ] dt-bindings: net: ravb : Add support for r8a7745 SoC
Add a new compatible string for the RZ/G1E (R8A7745) SoC. Signed-off-by: Biju Das <biju@bp.renesas.com> --- This patch is tested against linux-next tag next-20170815 as well as net-next. Documentation/devicetree/bindings/net/renesas,ravb.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt index 4717bc2..1672353 100644 --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt @@ -6,6 +6,7 @@ interface contains. Required properties: - compatible: Must contain one or more of the following: - "renesas,etheravb-r8a7743" for the R8A7743 SoC. + - "renesas,etheravb-r8a7745" for the R8A7745 SoC. - "renesas,etheravb-r8a7790" for the R8A7790 SoC. - "renesas,etheravb-r8a7791" for the R8A7791 SoC. - "renesas,etheravb-r8a7792" for the R8A7792 SoC. -- 1.9.1
[PATCH net-next repost v2] dt-bindings: net: ravb : Add support for r8a7743 SoC
Add a new compatible string for the RZ/G1M (R8A7743) SoC. Signed-off-by: Biju Das <biju@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+rene...@glider.be> Reviewed-by: Simon Horman <horms+rene...@verge.net.au> --- v1->v2 * Changed the subject * re-formatted the required properties .../devicetree/bindings/net/renesas,ravb.txt | 29 +- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt index b519503..4717bc2 100644 --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt @@ -4,19 +4,24 @@ This file provides information on what the device node for the Ethernet AVB interface contains. Required properties: -- compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. - "renesas,etheravb-r8a7791" if the device is a part of R8A7791 SoC. - "renesas,etheravb-r8a7792" if the device is a part of R8A7792 SoC. - "renesas,etheravb-r8a7793" if the device is a part of R8A7793 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-r8a7796" if the device is a part of R8A7796 SoC. - "renesas,etheravb-rcar-gen2" for generic R-Car Gen 2 compatible interface. - "renesas,etheravb-rcar-gen3" for generic R-Car Gen 3 compatible interface. +- compatible: Must contain one or more of the following: + - "renesas,etheravb-r8a7743" for the R8A7743 SoC. + - "renesas,etheravb-r8a7790" for the R8A7790 SoC. + - "renesas,etheravb-r8a7791" for the R8A7791 SoC. + - "renesas,etheravb-r8a7792" for the R8A7792 SoC. + - "renesas,etheravb-r8a7793" for the R8A7793 SoC. + - "renesas,etheravb-r8a7794" for the R8A7794 SoC. + - "renesas,etheravb-rcar-gen2" as a fallback for the above + R-Car Gen2 and RZ/G1 devices. - When compatible with the generic version, nodes must list the - SoC-specific version corresponding to the platform first - followed by the generic version. + - "renesas,etheravb-r8a7795" for the R8A7795 SoC. + - "renesas,etheravb-r8a7796" for the R8A7796 SoC. + - "renesas,etheravb-rcar-gen3" as a fallback for the above + R-Car Gen3 devices. + + 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 -- 1.9.1
[PATCH v2] dt-bindings: net: ravb : Add support for r8a7743 SoC
Add a new compatible string for the RZ/G1M (R8A7743) SoC. Signed-off-by: Biju Das <biju@bp.renesas.com> --- v1->v2 * Changed the subject * re-formatted the required properties .../devicetree/bindings/net/renesas,ravb.txt | 29 +- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt index b519503..4717bc2 100644 --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt @@ -4,19 +4,24 @@ This file provides information on what the device node for the Ethernet AVB interface contains. Required properties: -- compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. - "renesas,etheravb-r8a7791" if the device is a part of R8A7791 SoC. - "renesas,etheravb-r8a7792" if the device is a part of R8A7792 SoC. - "renesas,etheravb-r8a7793" if the device is a part of R8A7793 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-r8a7796" if the device is a part of R8A7796 SoC. - "renesas,etheravb-rcar-gen2" for generic R-Car Gen 2 compatible interface. - "renesas,etheravb-rcar-gen3" for generic R-Car Gen 3 compatible interface. +- compatible: Must contain one or more of the following: + - "renesas,etheravb-r8a7743" for the R8A7743 SoC. + - "renesas,etheravb-r8a7790" for the R8A7790 SoC. + - "renesas,etheravb-r8a7791" for the R8A7791 SoC. + - "renesas,etheravb-r8a7792" for the R8A7792 SoC. + - "renesas,etheravb-r8a7793" for the R8A7793 SoC. + - "renesas,etheravb-r8a7794" for the R8A7794 SoC. + - "renesas,etheravb-rcar-gen2" as a fallback for the above + R-Car Gen2 and RZ/G1 devices. - When compatible with the generic version, nodes must list the - SoC-specific version corresponding to the platform first - followed by the generic version. + - "renesas,etheravb-r8a7795" for the R8A7795 SoC. + - "renesas,etheravb-r8a7796" for the R8A7796 SoC. + - "renesas,etheravb-rcar-gen3" as a fallback for the above + R-Car Gen3 devices. + + 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 -- 1.9.1
RE: [PATCH v 1/2] ravb: Add support for r8a7743 SoC
Hello, Thanks for the review. > -Original Message- > From: Rob Herring [mailto:r...@kernel.org] > Sent: 10 July 2017 02:20 > To: Biju Das <biju@bp.renesas.com> > Cc: Mark Rutland <mark.rutl...@arm.com>; Russell King > <li...@armlinux.org.uk>; Sergei Shtylyov > <sergei.shtyl...@cogentembedded.com>; Simon Horman > <ho...@verge.net.au>; Magnus Damm <magnus.d...@gmail.com>; Chris > Paterson <chris.paters...@renesas.com>; devicet...@vger.kernel.org; linux- > renesas-...@vger.kernel.org; linux-arm-ker...@lists.infradead.org; > netdev@vger.kernel.org > Subject: Re: [PATCH v 1/2] ravb: Add support for r8a7743 SoC > > On Wed, Jul 05, 2017 at 02:01:50PM +0100, Biju Das wrote: > > Add support for Gigabit Ethernet E-MAC on r8a7743 (RZ/G1M) SoC. > > Renesas RZ/G1M (R8A7743) SoC Ethernet AVB IP is identical to the R-Car > > Gen2 family. > > For the subject: "dt-bindings: net: ..." I will change the subject to "dt-bindings: net: ravb: .. > > > > > Signed-off-by: Biju Das <biju@bp.renesas.com> > > Reviewed-by: Chris Paterson <chris.paters...@renesas.com> > > --- > > Documentation/devicetree/bindings/net/renesas,ravb.txt | 3 ++- > > drivers/net/ethernet/renesas/ravb_main.c | 1 + > > 2 files changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt > > b/Documentation/devicetree/bindings/net/renesas,ravb.txt > > index b519503..bc692ab 100644 > > --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt > > +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt > > @@ -4,7 +4,8 @@ This file provides information on what the device node > > for the Ethernet AVB interface contains. > > > > Required properties: > > -- compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 > SoC. > > +- compatible: "renesas,etheravb-r8a7743" if the device is a part of R8A7743 > SoC. > > + "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. > > Please re-format like this: > > - compatible: Must be one of: > ... > Ok. I will change this as well. > So it's a one line change to add new compatibles. > > >"renesas,etheravb-r8a7791" if the device is a part of R8A7791 SoC. > >"renesas,etheravb-r8a7792" if the device is a part of R8A7792 SoC. > >"renesas,etheravb-r8a7793" if the device is a part of R8A7793 SoC. > > diff --git a/drivers/net/ethernet/renesas/ravb_main.c > > b/drivers/net/ethernet/renesas/ravb_main.c > > index 5931e85..e35b30f 100644 > > --- a/drivers/net/ethernet/renesas/ravb_main.c > > +++ b/drivers/net/ethernet/renesas/ravb_main.c > > @@ -1869,6 +1869,7 @@ static int ravb_mdio_release(struct ravb_private > > *priv) } > > > > static const struct of_device_id ravb_match_table[] = { > > +{ .compatible = "renesas,etheravb-r8a7743", .data = (void > > +*)RCAR_GEN2 }, > > { .compatible = "renesas,etheravb-r8a7790", .data = (void > *)RCAR_GEN2 }, > > { .compatible = "renesas,etheravb-r8a7794", .data = (void > *)RCAR_GEN2 }, > > { .compatible = "renesas,etheravb-rcar-gen2", .data = (void > > *)RCAR_GEN2 }, > > -- > > 1.9.1 > > Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.
[PATCH v2 0/2] Add RZ/G1M (R8A7743) Ethernet AVB support
Hi All, This series aims to upstream the Ethernet AVB driver support for RZ/G1M (r8a7743) SoC . The iWave RZ/G1M Qseven SOM supports Gigabit Ethernet Phy from Micrel(KSZ9031MNX). Gigabit Ethernet support is available in Renesas AVB driver. This series has been tested against linux-next tag next-20170704. Modifications: v1->v2 -Dropped the driver update,as is it not needed due to the presence of family-specific compatible values. -Added Reviewed-by: Geert Uytterhoeven <geert+rene...@glider.be> for the DT binding patch -Added Acked-by: Geert Uytterhoeven <geert+rene...@glider.be> for the defconfig: Enable Ethernet AVB patch History: --- [v1]: https://www.spinics.net/lists/arm-kernel/msg592366.html Biju Das (2): ravb: Document binding for r8a7743 SoC ARM: shmobile: defconfig: Enable Ethernet AVB Documentation/devicetree/bindings/net/renesas,ravb.txt | 3 ++- arch/arm/configs/shmobile_defconfig| 1 + 2 files changed, 3 insertions(+), 1 deletion(-) -- 1.9.1
[PATCH v2 1/2] ravb: Document binding for r8a7743 SoC
Add a new compatible string for the RZ/G1M (R8A7743) SoC. Signed-off-by: Biju Das <biju@bp.renesas.com> Reviewed-by: Chris Paterson <chris.paters...@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+rene...@glider.be> --- Documentation/devicetree/bindings/net/renesas,ravb.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt index b519503..bc692ab 100644 --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt @@ -4,7 +4,8 @@ This file provides information on what the device node for the Ethernet AVB interface contains. Required properties: -- compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. +- compatible: "renesas,etheravb-r8a7743" if the device is a part of R8A7743 SoC. + "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. "renesas,etheravb-r8a7791" if the device is a part of R8A7791 SoC. "renesas,etheravb-r8a7792" if the device is a part of R8A7792 SoC. "renesas,etheravb-r8a7793" if the device is a part of R8A7793 SoC. -- 1.9.1
[PATCH v2 2/2] ARM: shmobile: defconfig: Enable Ethernet AVB
The iWave RZ/G1M Q7 SOM supports Gigabit Ethernet Phy (Micrel KSZ9031MNX). Gigabit Ethernet support is available in Renesas AVB driver. To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration. Signed-off-by: Biju Das <biju@bp.renesas.com> Reviewed-by: Chris Paterson <chris.paters...@renesas.com> Acked-by: Geert Uytterhoeven <geert+rene...@glider.be> --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 3c66a42..d992911 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -83,6 +83,7 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_NATSEMI is not set CONFIG_SH_ETH=y +CONFIG_RAVB=y # CONFIG_NET_VENDOR_SEEQ is not set CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set -- 1.9.1
RE: [PATCH v 1/2] ravb: Add support for r8a7743 SoC
> -Original Message- > From: devicetree-ow...@vger.kernel.org [mailto:devicetree- > ow...@vger.kernel.org] On Behalf Of Sergei Shtylyov > Sent: 05 July 2017 14:21 > To: Biju Das <biju@bp.renesas.com>; Rob Herring <robh...@kernel.org>; > Mark Rutland <mark.rutl...@arm.com>; Russell King > <li...@armlinux.org.uk> > Cc: Simon Horman <ho...@verge.net.au>; Magnus Damm > <magnus.d...@gmail.com>; Chris Paterson > <chris.paters...@renesas.com>; devicet...@vger.kernel.org; linux-renesas- > s...@vger.kernel.org; linux-arm-ker...@lists.infradead.org; > netdev@vger.kernel.org > Subject: Re: [PATCH v 1/2] ravb: Add support for r8a7743 SoC > > Hello! > > On 07/05/2017 04:01 PM, Biju Das wrote: > > > Add support for Gigabit Ethernet E-MAC on r8a7743 (RZ/G1M) SoC. > > Renesas RZ/G1M (R8A7743) SoC Ethernet AVB IP is identical to the R-Car > > Gen2 family. > > > > Signed-off-by: Biju Das <biju@bp.renesas.com> > > Reviewed-by: Chris Paterson <chris.paters...@renesas.com> > [...] > > diff --git a/drivers/net/ethernet/renesas/ravb_main.c > > b/drivers/net/ethernet/renesas/ravb_main.c > > index 5931e85..e35b30f 100644 > > --- a/drivers/net/ethernet/renesas/ravb_main.c > > +++ b/drivers/net/ethernet/renesas/ravb_main.c > > @@ -1869,6 +1869,7 @@ static int ravb_mdio_release(struct ravb_private > > *priv) } > > > > static const struct of_device_id ravb_match_table[] = { > > +{ .compatible = "renesas,etheravb-r8a7743", .data = (void > > +*)RCAR_GEN2 }, > > No, this shouldn't be needed if you specify "renesas,etheravb-rcar-gen2". > Thanks for the review. I will remove this change. > > { .compatible = "renesas,etheravb-r8a7790", .data = (void > *)RCAR_GEN2 }, > > { .compatible = "renesas,etheravb-r8a7794", .data = (void > *)RCAR_GEN2 }, > > { .compatible = "renesas,etheravb-rcar-gen2", .data = (void > > *)RCAR_GEN2 }, > > MBR, Sergei > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in the > body > of a message to majord...@vger.kernel.org More majordomo info at > http://vger.kernel.org/majordomo-info.html Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.
[PATCH v 0/2] Add RZ/G1M (R8A7743) Ethernet AVB support
This series aims to add Gigabit Ethernet E-MAC support on r8a7743 (RZ/G1M) SoC. The iWave RZ/G1M Qseven SOM supports Gigabit Ethernet Phy from Micrel(KSZ9031MNX). Gigabit Ethernet support is available in Renesas AVB driver. This series has been tested against linux-next tag next-20170704. Biju Das (2): ravb: Add support for r8a7743 SoC ARM: shmobile: defconfig: Enable Ethernet AVB Documentation/devicetree/bindings/net/renesas,ravb.txt | 3 ++- arch/arm/configs/shmobile_defconfig| 1 + drivers/net/ethernet/renesas/ravb_main.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) -- 1.9.1
[PATCH v 2/2] ARM: shmobile: defconfig: Enable Ethernet AVB
The iWave RZ/G1M Q7 SOM supports Gigabit Ethernet Phy (Micrel KSZ9031MNX). Gigabit Ethernet support is available in Renesas AVB driver. To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration. Signed-off-by: Biju Das <biju@bp.renesas.com> Reviewed-by: Chris Paterson <chris.paters...@renesas.com> --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 3c66a42..d992911 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -83,6 +83,7 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_NATSEMI is not set CONFIG_SH_ETH=y +CONFIG_RAVB=y # CONFIG_NET_VENDOR_SEEQ is not set CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set -- 1.9.1
[PATCH v 1/2] ravb: Add support for r8a7743 SoC
Add support for Gigabit Ethernet E-MAC on r8a7743 (RZ/G1M) SoC. Renesas RZ/G1M (R8A7743) SoC Ethernet AVB IP is identical to the R-Car Gen2 family. Signed-off-by: Biju Das <biju@bp.renesas.com> Reviewed-by: Chris Paterson <chris.paters...@renesas.com> --- Documentation/devicetree/bindings/net/renesas,ravb.txt | 3 ++- drivers/net/ethernet/renesas/ravb_main.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt index b519503..bc692ab 100644 --- a/Documentation/devicetree/bindings/net/renesas,ravb.txt +++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt @@ -4,7 +4,8 @@ This file provides information on what the device node for the Ethernet AVB interface contains. Required properties: -- compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. +- compatible: "renesas,etheravb-r8a7743" if the device is a part of R8A7743 SoC. + "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC. "renesas,etheravb-r8a7791" if the device is a part of R8A7791 SoC. "renesas,etheravb-r8a7792" if the device is a part of R8A7792 SoC. "renesas,etheravb-r8a7793" if the device is a part of R8A7793 SoC. diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 5931e85..e35b30f 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1869,6 +1869,7 @@ static int ravb_mdio_release(struct ravb_private *priv) } static const struct of_device_id ravb_match_table[] = { + { .compatible = "renesas,etheravb-r8a7743", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,etheravb-r8a7790", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,etheravb-r8a7794", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,etheravb-rcar-gen2", .data = (void *)RCAR_GEN2 }, -- 1.9.1