netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: macb: Add SG support for Zynq SOC family
@ 2015-07-06  4:32 Punnaiah Choudary Kalluri
  2015-07-06  8:06 ` Nicolas Ferre
  2015-07-08 21:43 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Punnaiah Choudary Kalluri @ 2015-07-06  4:32 UTC (permalink / raw)
  To: nicolas.ferre
  Cc: netdev, linux-kernel, harinik, michals, Punnaiah Choudary Kalluri

Enable SG support for Zynq SOC family devices.

Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
---
 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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] net: macb: Add SG support for Zynq SOC family
  2015-07-06  4:32 [PATCH] net: macb: Add SG support for Zynq SOC family Punnaiah Choudary Kalluri
@ 2015-07-06  8:06 ` Nicolas Ferre
  2015-07-08 21:43 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Ferre @ 2015-07-06  8:06 UTC (permalink / raw)
  To: Punnaiah Choudary Kalluri, netdev, David Miller
  Cc: linux-kernel, harinik, michals, Punnaiah Choudary Kalluri

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 <punnaia@xilinx.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> ---
>  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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] net: macb: Add SG support for Zynq SOC family
  2015-07-06  4:32 [PATCH] net: macb: Add SG support for Zynq SOC family Punnaiah Choudary Kalluri
  2015-07-06  8:06 ` Nicolas Ferre
@ 2015-07-08 21:43 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-07-08 21:43 UTC (permalink / raw)
  To: punnaiah.choudary.kalluri
  Cc: nicolas.ferre, netdev, linux-kernel, harinik, michals, punnaia

From: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>
Date: Mon,  6 Jul 2015 10:02:53 +0530

> Enable SG support for Zynq SOC family devices.
> 
> Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>

Applied to net-next, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-07-08 21:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-06  4:32 [PATCH] net: macb: Add SG support for Zynq SOC family Punnaiah Choudary Kalluri
2015-07-06  8:06 ` Nicolas Ferre
2015-07-08 21:43 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).