ARM: ox810se: Add Ethernet support
Subsystems (5)
v2 cover ARM: ox810se: Add Ethernet support
This adds support for the Synopsys DWMAC controller found in the OX820SE SoC, by using almost the same glue code as the OX820.
Patch 1 & 2 are for net branch, patch 3 will be queued to arm-soc.
Changes since v1:
- correctly update value read from register
- add proper tag on patch 3 for arm-soc tree
Neil Armstrong (3):
dt-bindings: net: oxnas-dwmac: Add bindings for OX810SE
net: stmmac: dwmac-oxnas: Add support for OX810SE
ARM: dts: ox810se: Add Ethernet support
.../devicetree/bindings/net/oxnas-dwmac.txt | 3 + arch/arm/boot/dts/ox810se-wd-mbwe.dts | 4 + arch/arm/boot/dts/ox810se.dtsi | 18 +++ .../net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 115 +++++++++++++----- 4 files changed, 111 insertions(+), 29 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/3 dt-bindings: net: oxnas-dwmac: Add bindings for OX810SE
Add SoC specific bindings for OX810SE support.
--- Documentation/devicetree/bindings/net/oxnas-dwmac.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/net/oxnas-dwmac.txt +3 -0
@@ -9,6 +9,9 @@ Required properties on all platforms: - compatible: For the OX820 SoC, it should be : - "oxsemi,ox820-dwmac" to select glue - "snps,dwmac-3.512" to select IP version. + For the OX810SE SoC, it should be : + - "oxsemi,ox810se-dwmac" to select glue + - "snps,dwmac-3.512" to select IP version. - clocks: Should contain phandles to the following clocks - clock-names: Should contain the following:
Signature · 1 line
2.25.1
PATCH v2 2/3 net: stmmac: dwmac-oxnas: Add support for OX810SE
In reply to Neil ArmstrongAdd support for OX810SE dwmac glue setup, which is a simplified version of the OX820 introduced later with more control on the PHY interface.
--- .../net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 115 +++++++++++++----- 1 file changed, 86 insertions(+), 29 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c +86 -29
@@ -12,6 +12,7 @@#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/mfd/syscon.h>
@@ -48,16 +49,75 @@#define DWMAC_RX_VARDELAY (d) ((d) << DWMAC_RX_VARDELAY_SHIFT)#define DWMAC_RXN_VARDELAY (d) ((d) << DWMAC_RXN_VARDELAY_SHIFT) +struct oxnas_dwmac ; + +struct oxnas_dwmac_data { +int (*setup)(struct oxnas_dwmac *dwmac); +}; +struct oxnas_dwmac {struct device *dev;struct clk *clk;struct regmap *regmap; +const struct oxnas_dwmac_data *data; }; +static int oxnas_dwmac_setup_ox810se (struct oxnas_dwmac *dwmac) +{ +unsigned int value; +int ret; + + ret =regmap_read (dwmac->regmap,OXNAS_DWMAC_CTRL_REGOFFSET , &value); +if (ret <0 ) +return ret; + +/* Enable GMII_GTXCLK to follow GMII_REFCLK, required for gigabit PHY */ + value |=BIT (DWMAC_CKEN_GTX ) | +/* Use simple mux for 25/125 Mhz clock switching */ +BIT (DWMAC_SIMPLE_MUX ); + +regmap_write (dwmac->regmap,OXNAS_DWMAC_CTRL_REGOFFSET , value); + +return 0 ; +} + +static int oxnas_dwmac_setup_ox820 (struct oxnas_dwmac *dwmac) +{ +unsigned int value; +int ret; + + ret =regmap_read (dwmac->regmap,OXNAS_DWMAC_CTRL_REGOFFSET , &value); +if (ret <0 ) +return ret; + +/* Enable GMII_GTXCLK to follow GMII_REFCLK, required for gigabit PHY */ + value |=BIT (DWMAC_CKEN_GTX ) | +/* Use simple mux for 25/125 Mhz clock switching */ +BIT (DWMAC_SIMPLE_MUX ) | +/* set auto switch tx clock source */ +BIT (DWMAC_AUTO_TX_SOURCE ) | +/* enable tx & rx vardelay */ +BIT (DWMAC_CKEN_TX_OUT ) | +BIT (DWMAC_CKEN_TXN_OUT ) | +BIT (DWMAC_CKEN_TX_IN ) | +BIT (DWMAC_CKEN_RX_OUT ) | +BIT (DWMAC_CKEN_RXN_OUT ) | +BIT (DWMAC_CKEN_RX_IN ); +regmap_write (dwmac->regmap,OXNAS_DWMAC_CTRL_REGOFFSET , value); + +/* set tx & rx vardelay */ + value =DWMAC_TX_VARDELAY (4 ) | +DWMAC_TXN_VARDELAY (2 ) | +DWMAC_RX_VARDELAY (10 ) | +DWMAC_RXN_VARDELAY (8 ); +regmap_write (dwmac->regmap,OXNAS_DWMAC_DELAY_REGOFFSET , value); + +return 0 ; +} +static int oxnas_dwmac_init (struct platform_device *pdev,void *priv) {struct oxnas_dwmac *dwmac = priv; -unsigned int value;int ret;/* Reset HW here before changing the glue configuration */
@@ -69,35 +129,11 @@ static int oxnas_dwmac_init(struct platform_device *pdev, void *priv)if (ret)return ret; - ret =regmap_read (dwmac->regmap,OXNAS_DWMAC_CTRL_REGOFFSET , &value); -if (ret <0 ) { + ret = dwmac->data->setup (dwmac); +if (ret)clk_disable_unprepare (dwmac->clk); -return ret; - } -/* Enable GMII_GTXCLK to follow GMII_REFCLK, required for gigabit PHY */ - value |=BIT (DWMAC_CKEN_GTX ) | -/* Use simple mux for 25/125 Mhz clock switching */ -BIT (DWMAC_SIMPLE_MUX ) | -/* set auto switch tx clock source */ -BIT (DWMAC_AUTO_TX_SOURCE ) | -/* enable tx & rx vardelay */ -BIT (DWMAC_CKEN_TX_OUT ) | -BIT (DWMAC_CKEN_TXN_OUT ) | -BIT (DWMAC_CKEN_TX_IN ) | -BIT (DWMAC_CKEN_RX_OUT ) | -BIT (DWMAC_CKEN_RXN_OUT ) | -BIT (DWMAC_CKEN_RX_IN ); -regmap_write (dwmac->regmap,OXNAS_DWMAC_CTRL_REGOFFSET , value); - -/* set tx & rx vardelay */ - value =DWMAC_TX_VARDELAY (4 ) | -DWMAC_TXN_VARDELAY (2 ) | -DWMAC_RX_VARDELAY (10 ) | -DWMAC_RXN_VARDELAY (8 ); -regmap_write (dwmac->regmap,OXNAS_DWMAC_DELAY_REGOFFSET , value); - -return 0 ; +return ret; }static void oxnas_dwmac_exit (struct platform_device *pdev,void *priv)
@@ -128,6 +164,12 @@ static int oxnas_dwmac_probe(struct platform_device *pdev) goto err_remove_config_dt; } + dwmac->data = (const struct oxnas_dwmac_data *)of_device_get_match_data (&pdev->dev); +if (!dwmac->data) { + ret = -EINVAL ; + goto err_remove_config_dt; + } + dwmac->dev = &pdev->dev; plat_dat->bsp_priv = dwmac; plat_dat->init = oxnas_dwmac_init;
@@ -166,8 +208,23 @@ static int oxnas_dwmac_probe(struct platform_device *pdev)return ret; } +static const struct oxnas_dwmac_data ox810se_dwmac_data = { + .setup = oxnas_dwmac_setup_ox810se, +}; + +static const struct oxnas_dwmac_data ox820_dwmac_data = { + .setup = oxnas_dwmac_setup_ox820, +}; +static const struct of_device_id oxnas_dwmac_match[] = { - { .compatible ="oxsemi,ox820-dwmac" }, + { + .compatible ="oxsemi,ox810se-dwmac" , + .data = &ox810se_dwmac_data, + }, + { + .compatible ="oxsemi,ox820-dwmac" , + .data = &ox820_dwmac_data, + }, { } };MODULE_DEVICE_TABLE (of, oxnas_dwmac_match);
Signature · 1 line
2.25.1
PATCH v2 3/3 ARM: dts: ox810se: Add Ethernet support
In reply to Neil ArmstrongAdd nodes for the embedded Synopsys DWMAC Ethernet controller.
--- arch/arm/boot/dts/ox810se-wd-mbwe.dts | 4 ++++ arch/arm/boot/dts/ox810se.dtsi | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+)
arch/arm/boot/dts/ox810se-wd-mbwe.dts +4 -0
@@ -103,6 +103,10 @@ rtc0: rtc@48 { }; }; +ða { + status = "okay"; +}; + &uart1 { status = "okay";
arch/arm/boot/dts/ox810se.dtsi +18 -0
@@ -81,6 +81,24 @@ soc { ranges; interrupt-parent = <&intc>; + etha: ethernet@40400000 { + compatible = "oxsemi,ox810se-dwmac", "snps,dwmac"; + reg = <0x40400000 0x2000>; + interrupts = <8>; + interrupt-names = "macirq"; + mac-address = [000000000000]; /* Filled in by U-Boot */ + phy-mode = "rgmii"; + + clocks = <&stdclk 6>, <&gmacclk>; + clock-names = "gmac", "stmmaceth"; + resets = <&reset 6>; + + /* Regmap for sys registers */ + oxsemi,sys-ctrl = <&sys>; + + status = "disabled"; + }; + apb-bridge@44000000 { #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerQuoted 8 lines · On Tue, 4 Jan 2022 15:56:43 +0100 Neil Armstrong wrote:
This adds support for the Synopsys DWMAC controller found in the OX820SE SoC, by using almost the same glue code as the OX820.
Patch 1 & 2 are for net branch, patch 3 will be queued to arm-soc.
Changes since v1:
- correctly update value read from register
- add proper tag on patch 3 for arm-soc tree
Waiting for Rob's ack, I just noticed you haven't CCed him directly. Adding his address now, but not sure if that's enough...
Re: [PATCH net-next v2 1/3] dt-bindings: net: oxnas-dwmac: Add bindings for OX810SE
In reply to Neil ArmstrongQuoted 7 lines · Neil Armstrong
Add SoC specific bindings for OX810SE support.
Signed-off-by Neil Armstrong <[email protected]>--- Documentation/devicetree/bindings/net/oxnas-dwmac.txt | 3 +++ 1 file changed, 3 insertions(+)
Jakub Kicinski
maintainerQuoted 2 lines · On Tue, 4 Jan 2022 15:56:43 +0100 Neil Armstrong wrote:
This adds support for the Synopsys DWMAC controller found in the OX820SE SoC, by using almost the same glue code as the OX820.
Alright, patches 1 and 2 are in net and on their way to 5.17. Thanks!
Neil Armstrong
AppliedHi,
Quoted 10 lines · Neil Armstrong
This adds support for the Synopsys DWMAC controller found in the OX820SE SoC, by using almost the same glue code as the OX820.
Patch 1 & 2 are for net branch, patch 3 will be queued to arm-soc.
Changes since v1:
- correctly update value read from register
- add proper tag on patch 3 for arm-soc tree[...]
Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/narmstrong/linux-oxnas.git (v5.18/dt)
[3/3] ARM: dts: ox810se: Add Ethernet support
https://git.kernel.org/narmstrong/linux-oxnas/c/ae552c33f6edad1097dec7a5543314d35d413b3e
Signature · 1 line
Neil