Skip to contentSkip to conversation

net/macb: add sama5d2 support

PATCH In review Nicolas Ferre 3 participants 7 messages Jun 18, 2015 – Jun 23, 2015

Subsystems (4)
Networking Network drivers Device tree bindings Atmel MACB Ethernet driver
lore
Share & tools
lore

Nicolas Ferre

author
#0 lore raw

v2 cover net/macb: add sama5d2 support

Hi,

This series is basically the support for another flavor of the GEM IP configuration. It ended up being a series because of some little fixes made to the binding documentation before adding the new compatibility string.

Bye,

v2: - fix bindings
- add sama5d2 compatibility string to the binding documentation

Cyrille Pitchen (1):
net/macb: add config for Atmel sama5d2 SoCs

Nicolas Ferre (3):
net/macb: bindings doc: fix compatibility string net/macb: bindings doc/trivial: fix sama5d4 comment net/macb: bindings doc: add sama5d2 compatibility sting

 Documentation/devicetree/bindings/net/macb.txt | 5 +++--
 drivers/net/ethernet/cadence/macb.c            | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
Signature · 1 line
2.1.3
author
#1 lore raw

PATCH v2 1/4 net/macb: bindings doc: fix compatibility string

In the driver and the DT bindings we use the "atmel" prefix. Fix it in the binding documentation.

Signed-off-by Nicolas Ferre <[email protected]>
---
 Documentation/devicetree/bindings/net/macb.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/net/macb.txt +2 -2
index 8ec5fdf444e9..0ae6974383d7 100644
@@ -7,8 +7,8 @@ Required properties:
   Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
   Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
   the Cadence GEM, or the generic form: "cdns,gem".
-  Use "cdns,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
-  Use "cdns,sama5d4-gem" for the Gigabit IP available on Atmel sama5d4 SoCs.
+  Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
+  Use "atmel,sama5d4-gem" for the Gigabit IP available on Atmel sama5d4 SoCs.
   Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.
 - reg: Address and length of the register set for the device
 - interrupts: Should contain macb interrupt
Signature · 1 line
2.1.3
author
#2 lore raw

PATCH v2 2/4 net/macb: bindings doc/trivial: fix sama5d4 comment

In reply to Nicolas Ferre

On sama5d4, we only have a GEM IP that is configured to do 10/100 Mbits. So the use of "Gigabit" can be confusing.

Signed-off-by Nicolas Ferre <[email protected]>
---
 Documentation/devicetree/bindings/net/macb.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/net/macb.txt +1 -1
index 0ae6974383d7..97349e3f3ff2 100644
@@ -8,7 +8,7 @@ Required properties:
   Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
   the Cadence GEM, or the generic form: "cdns,gem".
   Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
-  Use "atmel,sama5d4-gem" for the Gigabit IP available on Atmel sama5d4 SoCs.
+  Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
   Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.
 - reg: Address and length of the register set for the device
 - interrupts: Should contain macb interrupt
Signature · 1 line
2.1.3
author
#3 lore raw

PATCH v2 3/4 net/macb: bindings doc: add sama5d2 compatibility sting

In reply to Nicolas Ferre

Add sama5d2 to the biding documentation for this use of the GEM IP.

Signed-off-by Nicolas Ferre <[email protected]>
---
 Documentation/devicetree/bindings/net/macb.txt | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/macb.txt +1 -0
index 97349e3f3ff2..b5d79761ac97 100644
@@ -7,6 +7,7 @@ Required properties:
   Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
   Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
   the Cadence GEM, or the generic form: "cdns,gem".
+  Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
   Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
   Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
   Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.
Signature · 1 line
2.1.3
author
#4 lore raw

PATCH v2 4/4 net/macb: add config for Atmel sama5d2 SoCs

In reply to Nicolas Ferre

From: Cyrille Pitchen <[email protected]>

Add the compatible string for Atmel sama5d2 SoC family as the configuration options differ from other instances of the GEM.

Signed-off-by Cyrille Pitchen <[email protected]>
Signed-off-by Nicolas Ferre <[email protected]>
---
 drivers/net/ethernet/cadence/macb.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/net/ethernet/cadence/macb.c +8 -0
index 740d04fd2223..caeb39561567 100644
@@ -2713,6 +2713,13 @@ static const struct macb_config pc302gem_config = {
 	.init = macb_init,
 };
 
+static const struct macb_config sama5d2_config = {
+	.caps = 0,
+	.dma_burst_length = 16,
+	.clk_init = macb_clk_init,
+	.init = macb_init,
+};
+
 static const struct macb_config sama5d3_config = {
 	.caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,
 	.dma_burst_length = 16,

@@ -2756,6 +2763,7 @@ static const struct of_device_id macb_dt_ids[] = {
 	{ .compatible = "cdns,macb" },
 	{ .compatible = "cdns,pc302-gem", .data = &pc302gem_config },
 	{ .compatible = "cdns,gem", .data = &pc302gem_config },
+	{ .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },
 	{ .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config },
 	{ .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },
 	{ .compatible = "cdns,at91rm9200-emac", .data = &emac_config },
Signature · 1 line
2.1.3
Acked-by on the v2 series
#5 lore raw
In reply to Nicolas Ferre
Quoted 14 lines · Nicolas Ferre

Hi,

This series is basically the support for another flavor of the GEM IP configuration. It ended up being a series because of some little fixes made to the binding documentation before adding the new compatibility string.

Bye,

v2: - fix bindings
- add sama5d2 compatibility string to the binding documentation

Cyrille Pitchen (1):
net/macb: add config for Atmel sama5d2 SoCs

Quoted 9 lines

Nicolas Ferre (3):
net/macb: bindings doc: fix compatibility string net/macb: bindings doc/trivial: fix sama5d4 comment net/macb: bindings doc: add sama5d2 compatibility sting

 Documentation/devicetree/bindings/net/macb.txt | 5 +++--
 drivers/net/ethernet/cadence/macb.c            | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

For the patch set:

Acked-by Alexandre Belloni <[email protected]>
Signature · 3 lines
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
maintainer
#6 lore raw
In reply to Nicolas Ferre

From: Nicolas Ferre <[email protected]>
Date: Thu, 18 Jun 2015 16:27:19 +0200

Quoted 3 lines

This series is basically the support for another flavor of the GEM IP configuration. It ended up being a series because of some little fixes made to the binding documentation before adding the new compatibility string.

...

Quoted 2 lines

v2: - fix bindings
- add sama5d2 compatibility string to the binding documentation

Series applied, thanks.