Subject: [PATCH] net: macb: Add SG support for Zynq SOC family

Enable SG support for Zynq SOC family devices.

Signed-off-by: Punnaiah Choudary Kalluri <[email protected]>
---
drivers/net/ethernet/cadence/macb.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index caeb395..a4e3f86 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2741,8 +2741,7 @@ static const struct macb_config emac_config = {


static const struct macb_config zynqmp_config = {
- .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |
- MACB_CAPS_JUMBO,
+ .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO,
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
@@ -2750,8 +2749,7 @@ static const struct macb_config zynqmp_config = {
};

static const struct macb_config zynq_config = {
- .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |
- MACB_CAPS_NO_GIGABIT_HALF,
+ .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_NO_GIGABIT_HALF,
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
--
1.7.4


2015-07-06 08:07:44

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH] net: macb: Add SG support for Zynq SOC family

Le 06/07/2015 06:32, Punnaiah Choudary Kalluri a ?crit :
> Enable SG support for Zynq SOC family devices.
>
> Signed-off-by: Punnaiah Choudary Kalluri <[email protected]>

Acked-by: Nicolas Ferre <[email protected]>

> ---
> drivers/net/ethernet/cadence/macb.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
> index caeb395..a4e3f86 100644
> --- a/drivers/net/ethernet/cadence/macb.c
> +++ b/drivers/net/ethernet/cadence/macb.c
> @@ -2741,8 +2741,7 @@ static const struct macb_config emac_config = {
>
>
> static const struct macb_config zynqmp_config = {
> - .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |
> - MACB_CAPS_JUMBO,
> + .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO,
> .dma_burst_length = 16,
> .clk_init = macb_clk_init,
> .init = macb_init,
> @@ -2750,8 +2749,7 @@ static const struct macb_config zynqmp_config = {
> };
>
> static const struct macb_config zynq_config = {
> - .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |
> - MACB_CAPS_NO_GIGABIT_HALF,
> + .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_NO_GIGABIT_HALF,
> .dma_burst_length = 16,
> .clk_init = macb_clk_init,
> .init = macb_init,
>


--
Nicolas Ferre

2015-07-08 21:43:22

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] net: macb: Add SG support for Zynq SOC family

From: Punnaiah Choudary Kalluri <[email protected]>
Date: Mon, 6 Jul 2015 10:02:53 +0530

> Enable SG support for Zynq SOC family devices.
>
> Signed-off-by: Punnaiah Choudary Kalluri <[email protected]>

Applied to net-next, thanks.