Skip to contentSkip to conversation

net: stmmac glue layer for Amlogic Meson SoCs

PATCH New Beniamino Galvani 3 participants 6 messages Sep 20, 2014 – Sep 26, 2014

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

Hi,

the Ethernet controller available in Amlogic Meson6 and Meson8 SoCs is a Synopsys DesignWare MAC IP core, already supported by the stmmac driver.

These patches add a glue layer to the driver for the platform-specific settings required by the Amlogic variant.

This has been tested on a Amlogic S802 device with the initial Meson support submitted by Carlo Caione [1].

[1] http://lwn.net/Articles/612000/

Beniamino Galvani (2):
net: stmmac: add Amlogic Meson glue layer
net: stmmac: meson: document device tree bindings

 .../devicetree/bindings/net/meson-dwmac.txt        | 25 ++++++++
 drivers/net/ethernet/stmicro/stmmac/Kconfig        | 10 ++++
 drivers/net/ethernet/stmicro/stmmac/Makefile       |  1 +
 drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c  | 67 ++++++++++++++++++++++
 drivers/net/ethernet/stmicro/stmmac/stmmac.h       |  3 +
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |  3 +
 6 files changed, 109 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/2 net: stmmac: add Amlogic Meson glue layer

The Ethernet controller available in Meson6 and Meson8 SoCs is a Synopsys DesignWare MAC IP core, already supported by the stmmac driver.

This glue layer implements some platform-specific settings needed by the Amlogic variant.

---
 drivers/net/ethernet/stmicro/stmmac/Kconfig        | 10 ++++
 drivers/net/ethernet/stmicro/stmmac/Makefile       |  1 +
 drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c  | 67 ++++++++++++++++++++++
 drivers/net/ethernet/stmicro/stmmac/stmmac.h       |  3 +
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |  3 +
 5 files changed, 84 insertions(+)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
drivers/net/ethernet/stmicro/stmmac/Kconfig +10 -0
index 2d09c11..b02d4a3 100644
@@ -26,6 +26,16 @@ config STMMAC_PLATFORM
 
 	  If unsure, say N.
 
+config DWMAC_MESON
+	bool "Amlogic Meson dwmac support"
+	depends on STMMAC_PLATFORM && ARCH_MESON
+	help
+	  Support for Ethernet controller on Amlogic Meson SoCs.
+
+	  This selects the Amlogic Meson SoC glue layer support for
+	  the stmmac device driver. This driver is used for Meson6 and
+	  Meson8 SoCs.
+
 config DWMAC_SOCFPGA
 	bool "SOCFPGA dwmac support"
 	depends on STMMAC_PLATFORM && MFD_SYSCON && (ARCH_SOCFPGA || COMPILE_TEST)
drivers/net/ethernet/stmicro/stmmac/Makefile +1 -0
index 18695eb..0533d0b 100644
@@ -1,6 +1,7 @@
 obj-$(CONFIG_STMMAC_ETH) += stmmac.o
 stmmac-$(CONFIG_STMMAC_PLATFORM) += stmmac_platform.o
 stmmac-$(CONFIG_STMMAC_PCI) += stmmac_pci.o
+stmmac-$(CONFIG_DWMAC_MESON) += dwmac-meson.o
 stmmac-$(CONFIG_DWMAC_SUNXI) += dwmac-sunxi.o
 stmmac-$(CONFIG_DWMAC_STI) += dwmac-sti.o
 stmmac-$(CONFIG_DWMAC_SOCFPGA) += dwmac-socfpga.o
drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c new file +67 -0

67 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/stmmac.h +3 -0
index 58097c0..4452889 100644
@@ -137,6 +137,9 @@ void stmmac_disable_eee_mode(struct stmmac_priv *priv);
 bool stmmac_eee_init(struct stmmac_priv *priv);
 
 #ifdef CONFIG_STMMAC_PLATFORM
+#ifdef CONFIG_DWMAC_MESON
+extern const struct stmmac_of_data meson6_dwmac_data;
+#endif
 #ifdef CONFIG_DWMAC_SUNXI
 extern const struct stmmac_of_data sun7i_gmac_data;
 #endif
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +3 -0
index bb524a9..6521717 100644
@@ -30,6 +30,9 @@
 #include "stmmac.h"
 
 static const struct of_device_id stmmac_dt_ids[] = {
+#ifdef CONFIG_DWMAC_MESON
+	{ .compatible = "amlogic,meson6-dwmac", .data = &meson6_dwmac_data},
+#endif
 #ifdef CONFIG_DWMAC_SUNXI
 	{ .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data},
 #endif
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/2 net: stmmac: meson: document device tree bindings

In reply to Beniamino Galvani

Add the device tree bindings documentation for the Amlogic Meson variant of the Synopsys DesignWare MAC.

---
 .../devicetree/bindings/net/meson-dwmac.txt        | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt
Documentation/devicetree/bindings/net/meson-dwmac.txt new file +25 -0
new file mode 100644
index 0000000..ec633d7
@@ -0,0 +1,25 @@
+* Amlogic Meson DWMAC Ethernet controller
+
+The device inherits all the properties of the dwmac/stmmac devices
+described in the file net/stmmac.txt with the following changes.
+
+Required properties:
+
+- compatible: should be "amlogic,meson6-dwmac" along with "snps,dwmac"
+	      and any applicable more detailed version number
+	      described in net/stmmac.txt
+
+- reg: should contain a register range for the dwmac controller and
+       another one for the Amlogic specific configuration
+
+Example:
+
+	ethmac: ethernet@c9410000 {
+		compatible = "amlogic,meson6-dwmac", "snps,dwmac";
+		reg = <0xc9410000 0x10000
+		       0xc1108108 0x4>;
+		interrupts = <0 8 1>;
+		interrupt-names = "macirq";
+		clocks = <&clk81>;
+		clock-names = "stmmaceth";
+	}
Signature · 1 line
1.9.1
#3 lore raw
In reply to Beniamino Galvani
Quoted 11 lines · Beniamino Galvani

Hi,

the Ethernet controller available in Amlogic Meson6 and Meson8 SoCs is a Synopsys DesignWare MAC IP core, already supported by the stmmac driver.

These patches add a glue layer to the driver for the platform-specific settings required by the Amlogic variant.

This has been tested on a Amlogic S802 device with the initial Meson support submitted by Carlo Caione [1].

patches look fine just a warning with checkpatch as shown below then

[cavagiu@lxmcdt5 net.git]$ git-format-patch -2 0001-net-stmmac-add-Amlogic-Meson-glue-layer.patch 0002-net-stmmac-meson-document-device-tree-bindings.patch [cavagiu@lxmcdt5 net.git]$ !./
./scripts/checkpatch.pl 000*
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #57:
new file mode 100644

WARNING: DT compatible string vendor "amlogic" appears un-documented -- check ./Documentation/devicetree/bindings/vendor-prefixes.txt #152: FILE: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:34:
+ { .compatible = "amlogic,meson6-dwmac", .data = &meson6_dwmac_data},

total: 0 errors, 2 warnings, 0 checks, 108 lines checked

0001-net-stmmac-add-Amlogic-Meson-glue-layer.patch has style problems, please review.

If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #17:
new file mode 100644

total: 0 errors, 1 warnings, 25 lines checked

0002-net-stmmac-meson-document-device-tree-bindings.patch has style problems, please review.

If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.

Quoted 14 lines

[1] http://lwn.net/Articles/612000/

Beniamino Galvani (2):
net: stmmac: add Amlogic Meson glue layer
net: stmmac: meson: document device tree bindings

  .../devicetree/bindings/net/meson-dwmac.txt        | 25 ++++++++
  drivers/net/ethernet/stmicro/stmmac/Kconfig        | 10 ++++
  drivers/net/ethernet/stmicro/stmmac/Makefile       |  1 +
  drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c  | 67 ++++++++++++++++++++++
  drivers/net/ethernet/stmicro/stmmac/stmmac.h       |  3 +
  .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |  3 +
  6 files changed, 109 insertions(+)
Quoted 3 lines

create mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw
Quoted 30 lines · Giuseppe CAVALLARO
Quoted 11 lines · Beniamino Galvani

Hi,

the Ethernet controller available in Amlogic Meson6 and Meson8 SoCs is a Synopsys DesignWare MAC IP core, already supported by the stmmac driver.

These patches add a glue layer to the driver for the platform-specific settings required by the Amlogic variant.

This has been tested on a Amlogic S802 device with the initial Meson support submitted by Carlo Caione [1].

patches look fine just a warning with checkpatch as shown below then

[cavagiu@lxmcdt5 net.git]$ git-format-patch -2 0001-net-stmmac-add-Amlogic-Meson-glue-layer.patch 0002-net-stmmac-meson-document-device-tree-bindings.patch [cavagiu@lxmcdt5 net.git]$ !./
./scripts/checkpatch.pl 000*
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #57:
new file mode 100644

WARNING: DT compatible string vendor "amlogic" appears un-documented -- check ./Documentation/devicetree/bindings/vendor-prefixes.txt #152: FILE: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:34:

Review

Quoted 1 line
(quoted diff) +1 -0
+	{ .compatible = "amlogic,meson6-dwmac", .data = &meson6_dwmac_data},

Hi Giuseppe,

thanks for the review. The amlogic vendor prefix is documented as part of the initial Meson support in the series reported in the cover letter.

Beniamino

Quoted 38 lines

total: 0 errors, 2 warnings, 0 checks, 108 lines checked

0001-net-stmmac-add-Amlogic-Meson-glue-layer.patch has style problems, please review.

If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #17:
new file mode 100644

total: 0 errors, 1 warnings, 25 lines checked

0002-net-stmmac-meson-document-device-tree-bindings.patch has style problems, please review.

If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.

Quoted 17 lines

[1] http://lwn.net/Articles/612000/

Beniamino Galvani (2):
net: stmmac: add Amlogic Meson glue layer
net: stmmac: meson: document device tree bindings

 .../devicetree/bindings/net/meson-dwmac.txt        | 25 ++++++++
 drivers/net/ethernet/stmicro/stmmac/Kconfig        | 10 ++++
 drivers/net/ethernet/stmicro/stmmac/Makefile       |  1 +
 drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c  | 67 ++++++++++++++++++++++
 drivers/net/ethernet/stmicro/stmmac/stmmac.h       |  3 +
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |  3 +
 6 files changed, 109 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
maintainer
#5 lore raw
In reply to Beniamino Galvani

From: Beniamino Galvani <[email protected]>
Date: Sat, 20 Sep 2014 15:29:15 +0200

Quoted 5 lines

the Ethernet controller available in Amlogic Meson6 and Meson8 SoCs is a Synopsys DesignWare MAC IP core, already supported by the stmmac driver.

Quoted 7 lines

These patches add a glue layer to the driver for the platform-specific settings required by the Amlogic variant.

This has been tested on a Amlogic S802 device with the initial Meson support submitted by Carlo Caione [1].

[1] http://lwn.net/Articles/612000/

Series applied to net-next, thanks.