Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd598d20 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tg3-fixes' 



Siva Reddy Kallam says:

====================
tg3: Update copyright and fix for tx timeout with 5762

First patch:
        Update copyright

Second patch:
        Add higher cpu clock for 5762
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3578a7ec 3a498606

drivers/net/ethernet/broadcom/tg3.c

+13 −0
Original line number Diff line number Diff line
@@ -6,11 +6,15 @@ 
 * Copyright (C) 2004 Sun Microsystems Inc.

 * Copyright (C) 2005-2016 Broadcom Corporation.

 * Copyright (C) 2016-2017 Broadcom Limited.

 * Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"

 * refers to Broadcom Inc. and/or its subsidiaries.

 *

 * Firmware is:

 *	Derived from proprietary unpublished source code,

 *	Copyright (C) 2000-2016 Broadcom Corporation.

 *	Copyright (C) 2016-2017 Broadcom Ltd.

 *	Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"

 *	refers to Broadcom Inc. and/or its subsidiaries.

 *

 *	Permission is hereby granted for the distribution of this firmware

 *	data in hexadecimal or equivalent format, provided this copyright
@@ -9290,6 +9294,15 @@ static int tg3_chip_reset(struct tg3 *tp) 


	tg3_restore_clk(tp);



	/* Increase the core clock speed to fix tx timeout issue for 5762

	 * with 100Mbps link speed.

	 */

	if (tg3_asic_rev(tp) == ASIC_REV_5762) {

		val = tr32(TG3_CPMU_CLCK_ORIDE_ENABLE);

		tw32(TG3_CPMU_CLCK_ORIDE_ENABLE, val |

		     TG3_CPMU_MAC_ORIDE_ENABLE);

	}



	/* Reprobe ASF enable state.  */

	tg3_flag_clear(tp, ENABLE_ASF);

	tp->phy_flags &= ~(TG3_PHYFLG_1G_ON_VAUX_OK |

drivers/net/ethernet/broadcom/tg3.h

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * Copyright (C) 2004 Sun Microsystems Inc.

 * Copyright (C) 2007-2016 Broadcom Corporation.

 * Copyright (C) 2016-2017 Broadcom Limited.

 * Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"

 * refers to Broadcom Inc. and/or its subsidiaries.

 */



#ifndef _T3_H