From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 2 Jun 2025 23:19:27 +0000 (+0200)
Subject: gemini: Move back to using statically compiled PHYs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b24a5de9c39b6159b13bb278ee00c67cce5597;p=thirdparty%2Fopenwrt.git

gemini: Move back to using statically compiled PHYs

Trying to use modules for the PHY:s does not work:

The ethernet driver does not like to probe if it can't find
the PHY.

The ethernet driver really likes to be compiled-in. It will
not probe otherwise. Some hardware issue.

Revert things to how they always worked until I maybe solve
this.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/target/linux/gemini/config-6.12 b/target/linux/gemini/config-6.12
index 658aff13222..324fa5cd181 100644
--- a/target/linux/gemini/config-6.12
+++ b/target/linux/gemini/config-6.12
@@ -260,6 +260,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_MARVELL_PHY=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
@@ -354,6 +355,8 @@ CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
 CONFIG_RD_XZ=y
+CONFIG_REALTEK_PHY=y
+CONFIG_REALTEK_PHY_HWMON=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index a77adae7ed0..d7b77acdb15 100644
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -170,7 +170,7 @@ define Device/dlink_dns-313
 	DEVICE_VENDOR := D-Link
 	DEVICE_MODEL := DNS-313 1-Bay Network Storage Enclosure
 	DEVICE_DTS := gemini-dlink-dns-313
-	DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) usbgadget-acm kmod-phy-realtek
+	DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) usbgadget-acm
 	BLOCKSIZE := 1k
 	FILESYSTEMS := ext4
 	IMAGES := factory.bin.gz
@@ -186,7 +186,7 @@ define Device/storlink-reference
 	FILESYSTEMS := squashfs
 	IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 6144k | \
 		storlink-default-images $(1)
-	DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) kmod-phy-realtek
+	DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES)
 endef
 
 define Device/itian_sq201
@@ -194,7 +194,7 @@ define Device/itian_sq201
 	DEVICE_VENDOR := ITian
 	DEVICE_MODEL := Square One SQ201
 	DEVICE_DTS := gemini-sq201
-	DEVICE_PACKAGES += kmod-rt61-pci kmod-usb2-pci kmod-phy-marvell
+	DEVICE_PACKAGES += kmod-rt61-pci kmod-usb2-pci
 endef
 TARGET_DEVICES += itian_sq201
 
@@ -203,7 +203,6 @@ define Device/raidsonic_ib-4220-b
 	DEVICE_VENDOR := Raidsonic
 	DEVICE_MODEL := NAS IB-4220-B
 	DEVICE_DTS := gemini-nas4220b
-	DEVICE_PACKAGES += kmod-phy-marvell
 endef
 TARGET_DEVICES += raidsonic_ib-4220-b
 
@@ -212,7 +211,6 @@ define Device/storlink_sl93512r
 	DEVICE_VENDOR := StorLink
 	DEVICE_MODEL := SL93512r
 	DEVICE_DTS := gemini-sl93512r
-	DEVICE_PACKAGES += kmod-phy-marvell
 endef
 TARGET_DEVICES += storlink_sl93512r