Revert backported upstream commits 421f8663b3a7 and 8d820bc9d12b, which have introduced a regression in BCMGENET kconfig that disabled the network driver for the Raspberry Pi. Fixes:0c405bceba("kernel: bump 5.15 to 5.15.85") Fixes:e900822326("kernel: bump 5.15 to 5.15.84") Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
		
			
				
	
	
		
			24 lines
		
	
	
		
			883 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			24 lines
		
	
	
		
			883 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
From f032f801658ce6b47498f3e140f7e4aef0645042 Mon Sep 17 00:00:00 2001
 | 
						|
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
 | 
						|
Date: Wed, 28 Dec 2022 13:20:24 +0100
 | 
						|
Subject: [PATCH 2/2] Revert "net: broadcom: Fix BCMGENET Kconfig"
 | 
						|
 | 
						|
[ Upstream commit 8d820bc9d12b8beebca836cceaf2bbe68216c2f8 ]
 | 
						|
 | 
						|
This reverts commit 6a264203dbdb0d076891d83bf3bb274d6b3863f2.
 | 
						|
---
 | 
						|
 drivers/net/ethernet/broadcom/Kconfig | 2 +-
 | 
						|
 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
						|
 | 
						|
--- a/drivers/net/ethernet/broadcom/Kconfig
 | 
						|
+++ b/drivers/net/ethernet/broadcom/Kconfig
 | 
						|
@@ -77,7 +77,7 @@ config BCMGENET
 | 
						|
 	select BCM7XXX_PHY
 | 
						|
 	select MDIO_BCM_UNIMAC
 | 
						|
 	select DIMLIB
 | 
						|
-	select BROADCOM_PHY if (ARCH_BCM2835 && PTP_1588_CLOCK_OPTIONAL)
 | 
						|
+	select BROADCOM_PHY if ARCH_BCM2835
 | 
						|
 	help
 | 
						|
 	  This driver supports the built-in Ethernet MACs found in the
 | 
						|
 	  Broadcom BCM7xxx Set Top Box family chipset.
 |