* [PATCH v2 0/4] net/macb: add sama5d2 support
@ 2015-06-18 14:27 ` Nicolas Ferre
0 siblings, 0 replies; 14+ messages in thread
From: Nicolas Ferre @ 2015-06-18 14:27 UTC (permalink / raw)
To: linux-arm-kernel
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(-)
--
2.1.3
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH v2 1/4] net/macb: bindings doc: fix compatibility string
2015-06-18 14:27 ` Nicolas Ferre
@ 2015-06-18 14:27 ` Nicolas Ferre
-1 siblings, 0 replies; 14+ messages in thread
From: Nicolas Ferre @ 2015-06-18 14:27 UTC (permalink / raw)
To: linux-arm-kernel, David S. Miller, netdev
Cc: linux-kernel, Alexandre Belloni, Cyrille Pitchen, Boris BREZILLON,
Nicolas Ferre
In the driver and the DT bindings we use the "atmel" prefix. Fix it in the
binding documentation.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Documentation/devicetree/bindings/net/macb.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 8ec5fdf444e9..0ae6974383d7 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -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
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 1/4] net/macb: bindings doc: fix compatibility string
@ 2015-06-18 14:27 ` Nicolas Ferre
0 siblings, 0 replies; 14+ messages in thread
From: Nicolas Ferre @ 2015-06-18 14:27 UTC (permalink / raw)
To: linux-arm-kernel
In the driver and the DT bindings we use the "atmel" prefix. Fix it in the
binding documentation.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Documentation/devicetree/bindings/net/macb.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 8ec5fdf444e9..0ae6974383d7 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -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
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/4] net/macb: bindings doc/trivial: fix sama5d4 comment
2015-06-18 14:27 ` Nicolas Ferre
@ 2015-06-18 14:27 ` Nicolas Ferre
-1 siblings, 0 replies; 14+ messages in thread
From: Nicolas Ferre @ 2015-06-18 14:27 UTC (permalink / raw)
To: linux-arm-kernel, David S. Miller, netdev
Cc: linux-kernel, Alexandre Belloni, Cyrille Pitchen, Boris BREZILLON,
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 <nicolas.ferre@atmel.com>
---
Documentation/devicetree/bindings/net/macb.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 0ae6974383d7..97349e3f3ff2 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -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
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/4] net/macb: bindings doc/trivial: fix sama5d4 comment
@ 2015-06-18 14:27 ` Nicolas Ferre
0 siblings, 0 replies; 14+ messages in thread
From: Nicolas Ferre @ 2015-06-18 14:27 UTC (permalink / raw)
To: linux-arm-kernel
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 <nicolas.ferre@atmel.com>
---
Documentation/devicetree/bindings/net/macb.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 0ae6974383d7..97349e3f3ff2 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -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
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 3/4] net/macb: bindings doc: add sama5d2 compatibility sting
2015-06-18 14:27 ` Nicolas Ferre
@ 2015-06-18 14:27 ` Nicolas Ferre
-1 siblings, 0 replies; 14+ messages in thread
From: Nicolas Ferre @ 2015-06-18 14:27 UTC (permalink / raw)
To: linux-arm-kernel, David S. Miller, netdev
Cc: linux-kernel, Alexandre Belloni, Cyrille Pitchen, Boris BREZILLON,
Nicolas Ferre
Add sama5d2 to the biding documentation for this use of the GEM IP.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Documentation/devicetree/bindings/net/macb.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 97349e3f3ff2..b5d79761ac97 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -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.
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 3/4] net/macb: bindings doc: add sama5d2 compatibility sting
@ 2015-06-18 14:27 ` Nicolas Ferre
0 siblings, 0 replies; 14+ messages in thread
From: Nicolas Ferre @ 2015-06-18 14:27 UTC (permalink / raw)
To: linux-arm-kernel
Add sama5d2 to the biding documentation for this use of the GEM IP.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Documentation/devicetree/bindings/net/macb.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 97349e3f3ff2..b5d79761ac97 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -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.
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 4/4] net/macb: add config for Atmel sama5d2 SoCs
2015-06-18 14:27 ` Nicolas Ferre
@ 2015-06-18 14:27 ` Nicolas Ferre
-1 siblings, 0 replies; 14+ messages in thread
From: Nicolas Ferre @ 2015-06-18 14:27 UTC (permalink / raw)
To: linux-arm-kernel, David S. Miller, netdev
Cc: linux-kernel, Alexandre Belloni, Cyrille Pitchen, Boris BREZILLON,
Nicolas Ferre
From: Cyrille Pitchen <cyrille.pitchen@atmel.com>
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 <cyrille.pitchen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/net/ethernet/cadence/macb.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 740d04fd2223..caeb39561567 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -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 },
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 4/4] net/macb: add config for Atmel sama5d2 SoCs
@ 2015-06-18 14:27 ` Nicolas Ferre
0 siblings, 0 replies; 14+ messages in thread
From: Nicolas Ferre @ 2015-06-18 14:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Cyrille Pitchen <cyrille.pitchen@atmel.com>
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 <cyrille.pitchen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/net/ethernet/cadence/macb.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 740d04fd2223..caeb39561567 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -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 },
--
2.1.3
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v2 0/4] net/macb: add sama5d2 support
2015-06-18 14:27 ` Nicolas Ferre
@ 2015-06-18 15:34 ` Alexandre Belloni
-1 siblings, 0 replies; 14+ messages in thread
From: Alexandre Belloni @ 2015-06-18 15:34 UTC (permalink / raw)
To: Nicolas Ferre
Cc: linux-arm-kernel, David S. Miller, netdev, linux-kernel,
Cyrille Pitchen, Boris BREZILLON
On 18/06/2015 at 16:27:19 +0200, Nicolas Ferre wrote :
> 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(-)
>
For the patch set:
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 0/4] net/macb: add sama5d2 support
@ 2015-06-18 15:34 ` Alexandre Belloni
0 siblings, 0 replies; 14+ messages in thread
From: Alexandre Belloni @ 2015-06-18 15:34 UTC (permalink / raw)
To: linux-arm-kernel
On 18/06/2015 at 16:27:19 +0200, Nicolas Ferre wrote :
> 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(-)
>
For the patch set:
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 0/4] net/macb: add sama5d2 support
2015-06-18 14:27 ` Nicolas Ferre
@ 2015-06-23 8:29 ` David Miller
-1 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2015-06-23 8:29 UTC (permalink / raw)
To: nicolas.ferre
Cc: linux-arm-kernel, netdev, linux-kernel, alexandre.belloni,
cyrille.pitchen, boris.brezillon
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Thu, 18 Jun 2015 16:27:19 +0200
> 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.
...
> v2: - fix bindings
> - add sama5d2 compatibility string to the binding documentation
Series applied, thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 0/4] net/macb: add sama5d2 support
@ 2015-06-23 8:29 ` David Miller
0 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2015-06-23 8:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Thu, 18 Jun 2015 16:27:19 +0200
> 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.
...
> v2: - fix bindings
> - add sama5d2 compatibility string to the binding documentation
Series applied, thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread