[openwrt/openwrt] bcm27xx: fix BCMGENET kernel config

[LEDE Commits]

noltari pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/5863363493565f4b651baeb83251769f2b6d8929

commit 5863363493565f4b651baeb83251769f2b6d8929
Author: Álvaro Fernández Rojas <noltari at gmail.com>
AuthorDate: Wed Dec 28 13:40:03 2022 +0100

    bcm27xx: fix BCMGENET kernel config
    
    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: 0c405bceba11 ("kernel: bump 5.15 to 5.15.85")
    Fixes: e9008223268c ("kernel: bump 5.15 to 5.15.84")
    
    Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
 ...broadcom-Add-PTP_1588_CLOCK_OPTIONAL-depe.patch | 31 ++++++++++++++++++++++
 ...-Revert-net-broadcom-Fix-BCMGENET-Kconfig.patch | 23 ++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/target/linux/bcm27xx/patches-5.15/200-Revert-net-broadcom-Add-PTP_1588_CLOCK_OPTIONAL-depe.patch b/target/linux/bcm27xx/patches-5.15/200-Revert-net-broadcom-Add-PTP_1588_CLOCK_OPTIONAL-depe.patch
new file mode 100644
index 0000000000..4357a6ba13
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.15/200-Revert-net-broadcom-Add-PTP_1588_CLOCK_OPTIONAL-depe.patch
@@ -0,0 +1,31 @@
+From 882882912cd25a637ba0cf09932ad248f584e680 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari at gmail.com>
+Date: Wed, 28 Dec 2022 13:19:49 +0100
+Subject: [PATCH 1/2] Revert "net: broadcom: Add PTP_1588_CLOCK_OPTIONAL
+ dependency for BCMGENET under ARCH_BCM2835"
+
+[ Upstream commit 421f8663b3a775c32f724f793264097c60028f2e ]
+
+This reverts commit eb96fd3983b2cca1c90db45eaff1de67b94f9950.
+---
+ drivers/net/ethernet/broadcom/Kconfig | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/broadcom/Kconfig
++++ b/drivers/net/ethernet/broadcom/Kconfig
+@@ -71,14 +71,13 @@ config BCM63XX_ENET
+ config BCMGENET
+ 	tristate "Broadcom GENET internal MAC support"
+ 	depends on HAS_IOMEM
+-	depends on PTP_1588_CLOCK_OPTIONAL || !ARCH_BCM2835
+ 	select MII
+ 	select PHYLIB
+ 	select FIXED_PHY
+ 	select BCM7XXX_PHY
+ 	select MDIO_BCM_UNIMAC
+ 	select DIMLIB
+-	select BROADCOM_PHY if ARCH_BCM2835
++	select BROADCOM_PHY if (ARCH_BCM2835 && PTP_1588_CLOCK_OPTIONAL)
+ 	help
+ 	  This driver supports the built-in Ethernet MACs found in the
+ 	  Broadcom BCM7xxx Set Top Box family chipset.
diff --git a/target/linux/bcm27xx/patches-5.15/201-Revert-net-broadcom-Fix-BCMGENET-Kconfig.patch b/target/linux/bcm27xx/patches-5.15/201-Revert-net-broadcom-Fix-BCMGENET-Kconfig.patch
new file mode 100644
index 0000000000..1e29da5c95
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.15/201-Revert-net-broadcom-Fix-BCMGENET-Kconfig.patch
@@ -0,0 +1,23 @@
+From f032f801658ce6b47498f3e140f7e4aef0645042 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari at 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.