sun8i: r40: second ethernet support
v3 cover sun8i: r40: second ethernet support
This patch series adds support for two Ethernet ports on Allwinner R40.
R40 (aka V40,A40i,T3) has two different Ethernet IPs called EMAC and GMAC. EMAC only support 10/100 Mbit in MII mode, while GMAC support both 10/100 (MII) and 10/100/1000 (RGMII).
In contrast to A10/A20 where GMAC and EMAC share the same pins making EMAC somewhat pointless, on R40 EMAC can be routed to port H.
Both EMAC (on port H) and GMAC (on port A) can be then enabled at the same time, allowing for two ethernet ports.
Tested on custom A40i board with two IP101GRI PHYs in MII mode.
Changes in v3:
Minor fixes in bindings. Rebased on top of linux-next/master. dt_bindings_check and dtbs_check passed.
- bindings: separate commit for DT bindings
- bindings: simplify handling of compatible strings
- bindings: make resets property required on R40
- dts: get rid of duplicate node
Changes in v2:
- EMAC reset is no longer optional on R40
- Add a new DT compatible string for R40 EMAC
- Deassert reset line before enabling the clock
- minor fixes: formatting, DT node order, leftover pinctrl props
Evgeny Boger (3):
net: allwinner: reset control support
dt-bindings: net: support for Allwinner R40 EMAC controller
dts: r40: add second ethernet support
.../net/allwinner,sun4i-a10-emac.yaml | 20 +++++- arch/arm/boot/dts/sun8i-r40.dtsi | 50 +++++++++++++++ drivers/net/ethernet/allwinner/sun4i-emac.c | 64 +++++++++++++++++-- 3 files changed, 128 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/3 net: allwinner: reset control support
R40 (aka V40/A40i/T3) and A10/A20 share the same EMAC IP. However, on R40 the EMAC is gated by default.
--- drivers/net/ethernet/allwinner/sun4i-emac.c | 64 +++++++++++++++++++-- 1 file changed, 59 insertions(+), 5 deletions(-)
drivers/net/ethernet/allwinner/sun4i-emac.c +59 -5
@@ -28,6 +28,7 @@#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/phy.h> +#include <linux/reset.h> #include <linux/soc/sunxi/sunxi_sram.h> #include "sun4i-emac.h"
@@ -68,6 +69,15 @@ MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds");* devices, EMACA and EMACB. */ +/** +* struct emac_quirks - Differences between SoC variants. +* +* @has_reset: SoC needs reset deasserted. +*/ +struct emac_quirks { +bool has_reset; +}; +struct emac_board_info {struct clk *clk;struct device *dev;
@@ -85,6 +95,7 @@ struct emac_board_info {unsigned int link;unsigned int speed;unsigned int duplex; +struct reset_control *reset;phy_interface_t phy_interface; };
@@ -790,6 +801,7 @@ static int emac_probe(struct platform_device *pdev)struct emac_board_info *db;struct net_device *ndev;int ret =0 ; +const struct emac_quirks *quirks; ndev =alloc_etherdev (sizeof (struct emac_board_info ));if (!ndev) {
@@ -808,6 +820,13 @@ static int emac_probe(struct platform_device *pdev)spin_lock_init (&db->lock); + quirks =of_device_get_match_data (&pdev->dev); +if (!quirks) { +dev_err (&pdev->dev,"Failed to determine the quirks to use\n" ); + ret = -ENODEV ; + goto out; + } + db->membase =of_iomap (np,0 );if (!db->membase) {dev_err (&pdev->dev,"failed to remap registers\n" );
@@ -824,16 +843,31 @@ static int emac_probe(struct platform_device *pdev) goto out_iounmap; } +if (quirks->has_reset) { + db->reset =devm_reset_control_get_exclusive (&pdev->dev,NULL ); +if (IS_ERR (db->reset)) { +dev_err (&pdev->dev,"unable to request reset\n" ); + ret =PTR_ERR (db->reset); + goto out_dispose_mapping; + } + + ret =reset_control_deassert (db->reset); +if (ret) { +dev_err (&pdev->dev,"could not deassert EMAC reset\n" ); + goto out_dispose_mapping; + } + } + db->clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (db->clk)) { ret =PTR_ERR (db->clk); - goto out_dispose_mapping; + goto out_assert_reset; } ret =clk_prepare_enable (db->clk);if (ret) {dev_err (&pdev->dev,"Error couldn't enable clock (%d)\n" , ret); - goto out_dispose_mapping; + goto out_assert_reset; } ret =sunxi_sram_claim (&pdev->dev);
@@ -889,6 +923,8 @@ static int emac_probe(struct platform_device *pdev)sunxi_sram_release (&pdev->dev); out_clk_disable_unprepare:clk_disable_unprepare (db->clk); +out_assert_reset: +reset_control_assert (db->reset); out_dispose_mapping:irq_dispose_mapping (ndev->irq); out_iounmap:
@@ -909,6 +945,7 @@ static int emac_remove(struct platform_device *pdev)unregister_netdev (ndev);sunxi_sram_release (&pdev->dev);clk_disable_unprepare (db->clk); +reset_control_assert (db->reset);irq_dispose_mapping (ndev->irq);iounmap (db->membase);free_netdev (ndev);
@@ -940,11 +977,28 @@ static int emac_resume(struct platform_device *dev)return 0 ; } -static const struct of_device_id emac_of_match[] = { - {.compatible ="allwinner,sun4i-a10-emac" ,}, +static const struct emac_quirks sun4i_a10_emac_quirks = { + .has_reset = false, +}; + +static const struct emac_quirks sun4i_r40_emac_quirks = { + .has_reset = true, +}; +static const struct of_device_id emac_of_match[] = { + { + .compatible ="allwinner,sun4i-a10-emac" , + .data = &sun4i_a10_emac_quirks + }, + { + .compatible ="allwinner,sun4i-r40-emac" , + .data = &sun4i_r40_emac_quirks + },/* Deprecated */ - {.compatible ="allwinner,sun4i-emac" ,}, + { + .compatible ="allwinner,sun4i-emac" , + .data = &sun4i_a10_emac_quirks + }, {}, };
Signature · 1 line
2.25.1
Re: [PATCH v3 1/3] net: allwinner: reset control support
Hi
Quoted 2 lines · Evgeny Boger
R40 (aka V40/A40i/T3) and A10/A20 share the same EMAC IP. However, on R40 the EMAC is gated by default.
Gated is usually used for clocks, not reset lines, which would usually be asserted instead.
Quoted 125 lines
Signed-off-by Evgeny Boger <[email protected]>--- drivers/net/ethernet/allwinner/sun4i-emac.c | 64 +++++++++++++++++++-- 1 file changed, 59 insertions(+), 5 deletions(-)drivers/net/ethernet/allwinner/sun4i-emac.c +44
-4@@ -28,6 +28,7 @@#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/phy.h> +#include <linux/reset.h> #include <linux/soc/sunxi/sunxi_sram.h> #include "sun4i-emac.h" @@ -68,6 +69,15 @@ MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds");* devices, EMACA and EMACB. */ +/** +* struct emac_quirks - Differences between SoC variants. +* +* @has_reset: SoC needs reset deasserted. +*/ +struct emac_quirks { +bool has_reset; +}; +struct emac_board_info {struct clk *clk;struct device *dev;@@ -85,6 +95,7 @@ struct emac_board_info {unsigned int link;unsigned int speed;unsigned int duplex; +struct reset_control *reset;phy_interface_t phy_interface; };@@ -790,6 +801,7 @@ static int emac_probe(struct platform_device *pdev)struct emac_board_info *db;struct net_device *ndev;int ret =0 ; +const struct emac_quirks *quirks; ndev =alloc_etherdev (sizeof (struct emac_board_info ));if (!ndev) {@@ -808,6 +820,13 @@ static int emac_probe(struct platform_device *pdev)spin_lock_init (&db->lock); + quirks =of_device_get_match_data (&pdev->dev); +if (!quirks) { +dev_err (&pdev->dev,"Failed to determine the quirks to use\n" ); + ret = -ENODEV ; + goto out; + } + db->membase =of_iomap (np,0 );if (!db->membase) {dev_err (&pdev->dev,"failed to remap registers\n" );@@ -824,16 +843,31 @@ static int emac_probe(struct platform_device *pdev) goto out_iounmap; } +if (quirks->has_reset) { + db->reset =devm_reset_control_get_exclusive (&pdev->dev,NULL ); +if (IS_ERR (db->reset)) { +dev_err (&pdev->dev,"unable to request reset\n" ); + ret =PTR_ERR (db->reset); + goto out_dispose_mapping; + } + + ret =reset_control_deassert (db->reset); +if (ret) { +dev_err (&pdev->dev,"could not deassert EMAC reset\n" ); + goto out_dispose_mapping; + } + } + db->clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (db->clk)) { ret =PTR_ERR (db->clk); - goto out_dispose_mapping; + goto out_assert_reset; } ret =clk_prepare_enable (db->clk);if (ret) {dev_err (&pdev->dev,"Error couldn't enable clock (%d)\n" , ret); - goto out_dispose_mapping; + goto out_assert_reset; } ret =sunxi_sram_claim (&pdev->dev);@@ -889,6 +923,8 @@ static int emac_probe(struct platform_device *pdev)sunxi_sram_release (&pdev->dev); out_clk_disable_unprepare:clk_disable_unprepare (db->clk); +out_assert_reset: +reset_control_assert (db->reset); out_dispose_mapping:irq_dispose_mapping (ndev->irq); out_iounmap:@@ -909,6 +945,7 @@ static int emac_remove(struct platform_device *pdev)unregister_netdev (ndev);sunxi_sram_release (&pdev->dev);clk_disable_unprepare (db->clk); +reset_control_assert (db->reset);irq_dispose_mapping (ndev->irq);iounmap (db->membase);free_netdev (ndev);@@ -940,11 +977,28 @@ static int emac_resume(struct platform_device *dev)return 0 ; } -static const struct of_device_id emac_of_match[] = { - {.compatible ="allwinner,sun4i-a10-emac" ,}, +static const struct emac_quirks sun4i_a10_emac_quirks = { + .has_reset = false, +}; + +static const struct emac_quirks sun4i_r40_emac_quirks = {
drivers/net/ethernet/allwinner/sun4i-emac.c static int emac_resume(struct platform_device *dev) · line 994
Quoted 10 lines
drivers/net/ethernet/allwinner/sun4i-emac.c +9
-0+ .has_reset = true, +}; +static const struct of_device_id emac_of_match[] = { + { + .compatible ="allwinner,sun4i-a10-emac" , + .data = &sun4i_a10_emac_quirks + }, + { + .compatible ="allwinner,sun4i-r40-emac" ,
The R40 is part of the sun8i family
This needs to be updated in your binding and DT patch as well.
Maxime
PATCH v3 2/3 dt-bindings: net: support for Allwinner R40 EMAC controller
In reply to Evgeny BogerR40 and A10/A20 share the same EMAC IP. However, on R40 the EMAC is gated by default, so reset property is required.
--- .../net/allwinner,sun4i-a10-emac.yaml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml +19 -1
@@ -15,7 +15,9 @@ maintainers: properties: compatible: - const: allwinner,sun4i-a10-emac + enum: + - allwinner,sun4i-a10-emac + - allwinner,sun4i-r40-emac reg: maxItems: 1
@@ -30,6 +32,19 @@ properties: description: Phandle to the device SRAM $ref: /schemas/types.yaml#/definitions/phandle-array + resets: + maxItems: 1 + +if: + properties: + compatible: + contains: + const: allwinner,sun4i-r40-emac + +then: + required: + - resets + required: - compatible - reg
@@ -42,11 +57,14 @@ unevaluatedProperties: false examples: - | + #define RST_BUS_EMAC 14 + emac: ethernet@1c0b000 { compatible = "allwinner,sun4i-a10-emac"; reg = <0x01c0b000 0x1000>; interrupts = <55>; clocks = <&ahb_gates 17>; + resets = <&ccu RST_BUS_EMAC>; phy-handle = <&phy0>; allwinner,sram = <&emac_sram 1>; };
Signature · 1 line
2.25.1
Re: [PATCH v3 2/3] dt-bindings: net: support for Allwinner R40 EMAC controller
Quoted 2 lines · Evgeny Boger
R40 and A10/A20 share the same EMAC IP. However, on R40 the EMAC is gated by default, so reset
asserted rather than gated here too.
Otherwise,
Quoted 6 lines
property is required.
Signed-off-by Evgeny Boger <[email protected]>--- .../net/allwinner,sun4i-a10-emac.yaml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
PATCH v3 3/3 dts: r40: add second ethernet support
In reply to Evgeny BogerR40 (aka V40, A40i, T3) has two different Ethernet IP called EMAC and GMAC.
EMAC only support 10/100 Mbit in MII mode,
while GMAC support both 10/100 (MII) and 10/100/1000 (RGMII).
In contrast to A10/A20 where GMAC and EMAC share the same pins making EMAC somewhat pointless, on R40 EMAC can be routed to port H. Both EMAC (on port H) and GMAC (on port A)
can be then enabled at the same time, allowing for two ethernet ports.
--- arch/arm/boot/dts/sun8i-r40.dtsi | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
arch/arm/boot/dts/sun8i-r40.dtsi +50 -0
@@ -217,6 +217,20 @@ syscon: system-control@1c00000 { #size-cells = <1>; ranges; + sram_a: sram@0 { + compatible = "mmio-sram"; + reg = <0x00000000 0xc000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00000000 0xc000>; + + emac_sram: sram-section@8000 { + compatible = "allwinner,sun4i-a10-sram-a3-a4"; + reg = <0x8000 0x4000>; + status = "okay"; + }; + }; + sram_c: sram@1d00000 { compatible = "mmio-sram"; reg = <0x01d00000 0xd0000>;
@@ -543,6 +557,24 @@ gmac_rgmii_pins: gmac-rgmii-pins { drive-strength = <40>; }; + emac_pa_pins: emac-pa-pins { + pins = "PA0", "PA1", "PA2", + "PA3", "PA4", "PA5", "PA6", + "PA7", "PA8", "PA9", "PA10", + "PA11", "PA12", "PA13", "PA14", + "PA15", "PA16"; + function = "emac"; + }; + + emac_ph_pins: emac-ph-pins { + pins = "PH8", "PH9", "PH10", "PH11", + "PH14", "PH15", "PH16", "PH17", + "PH18","PH19", "PH20", "PH21", + "PH22", "PH23", "PH24", "PH25", + "PH26", "PH27"; + function = "emac"; + }; + i2c0_pins: i2c0-pins { pins = "PB0", "PB1"; function = "i2c0";
@@ -980,6 +1012,24 @@ gmac_mdio: mdio { }; }; + emac: ethernet@1c0b000 { + compatible = "allwinner,sun4i-r40-emac"; + reg = <0x01c0b000 0x1000>; + interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_EMAC>; + resets = <&ccu RST_BUS_EMAC>; + allwinner,sram = <&emac_sram 1>; + status = "disabled"; + }; + + emac_mdio: mdio@1c0b080 { + compatible = "allwinner,sun4i-a10-mdio"; + reg = <0x01c0b080 0x14>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + mbus: dram-controller@1c62000 { compatible = "allwinner,sun8i-r40-mbus"; reg = <0x01c62000 0x1000>;
Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH v3 3/3] dts: r40: add second ethernet support
Quoted 24 lines · Evgeny Boger
R40 (aka V40, A40i, T3) has two different Ethernet IP called EMAC and GMAC.
EMAC only support 10/100 Mbit in MII mode,
while GMAC support both 10/100 (MII) and 10/100/1000 (RGMII).In contrast to A10/A20 where GMAC and EMAC share the same pins making EMAC somewhat pointless, on R40 EMAC can be routed to port H. Both EMAC (on port H) and GMAC (on port A)
can be then enabled at the same time, allowing for two ethernet ports.Signed-off-by Evgeny Boger <[email protected]>--- arch/arm/boot/dts/sun8i-r40.dtsi | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)arch/arm/boot/dts/sun8i-r40.dtsi +1
-0@@ -217,6 +217,20 @@ syscon: system-control@1c00000 { #size-cells = <1>; ranges; + sram_a: sram@0 {
arch/arm/boot/dts/sun8i-r40.dtsi syscon: system-control@1c00000 { · line 230
Quoted 10 lines
arch/arm/boot/dts/sun8i-r40.dtsi +10
-0+ compatible = "mmio-sram"; + reg = <0x00000000 0xc000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x00000000 0xc000>; + + emac_sram: sram-section@8000 { + compatible = "allwinner,sun4i-a10-sram-a3-a4"; + reg = <0x8000 0x4000>; + status = "okay";
'okay' is the default, so you don't need it.
Quoted 60 lines
arch/arm/boot/dts/sun8i-r40.dtsi +39
-0+ }; + }; + sram_c: sram@1d00000 { compatible = "mmio-sram"; reg = <0x01d00000 0xd0000>;@@ -543,6 +557,24 @@ gmac_rgmii_pins: gmac-rgmii-pins { drive-strength = <40>; }; + emac_pa_pins: emac-pa-pins { + pins = "PA0", "PA1", "PA2", + "PA3", "PA4", "PA5", "PA6", + "PA7", "PA8", "PA9", "PA10", + "PA11", "PA12", "PA13", "PA14", + "PA15", "PA16"; + function = "emac"; + }; + + emac_ph_pins: emac-ph-pins { + pins = "PH8", "PH9", "PH10", "PH11", + "PH14", "PH15", "PH16", "PH17", + "PH18","PH19", "PH20", "PH21", + "PH22", "PH23", "PH24", "PH25", + "PH26", "PH27"; + function = "emac"; + }; + i2c0_pins: i2c0-pins { pins = "PB0", "PB1"; function = "i2c0";@@ -980,6 +1012,24 @@ gmac_mdio: mdio { }; }; + emac: ethernet@1c0b000 { + compatible = "allwinner,sun4i-r40-emac"; + reg = <0x01c0b000 0x1000>; + interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_EMAC>; + resets = <&ccu RST_BUS_EMAC>; + allwinner,sram = <&emac_sram 1>; + status = "disabled"; + }; + + emac_mdio: mdio@1c0b080 { + compatible = "allwinner,sun4i-a10-mdio"; + reg = <0x01c0b080 0x14>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + mbus: dram-controller@1c62000 { compatible = "allwinner,sun8i-r40-mbus"; reg = <0x01c62000 0x1000>;Signature · 1 line
2.25.1