From 2aa849d2c5451e0e6d16778295d33b38afe85767 Mon Sep 17 00:00:00 2001 From: Michal Kubecek Date: Feb 26 2024 10:42:04 +0000 Subject: net: ethernet: adi: move PHYLIB from vendor to driver symbol. Fix config dependencies. - restore config options from before 6.8-rc6: - NET_VENDOR_ADI=y - ADIN1110=m --- diff --git a/config/i386/pae b/config/i386/pae index 5b292df..c514e6b 100644 --- a/config/i386/pae +++ b/config/i386/pae @@ -3349,7 +3349,8 @@ CONFIG_FM10K=m CONFIG_IGC=m CONFIG_IDPF=m CONFIG_JME=m -# CONFIG_NET_VENDOR_ADI is not set +CONFIG_NET_VENDOR_ADI=y +CONFIG_ADIN1110=m CONFIG_NET_VENDOR_LITEX=y CONFIG_LITEX_LITEETH=m CONFIG_NET_VENDOR_MARVELL=y diff --git a/config/ppc64le/default b/config/ppc64le/default index 5ffa232..a822987 100644 --- a/config/ppc64le/default +++ b/config/ppc64le/default @@ -2958,7 +2958,8 @@ CONFIG_FM10K=m CONFIG_IGC=m CONFIG_IDPF=m # CONFIG_JME is not set -# CONFIG_NET_VENDOR_ADI is not set +CONFIG_NET_VENDOR_ADI=y +CONFIG_ADIN1110=m CONFIG_NET_VENDOR_LITEX=y CONFIG_LITEX_LITEETH=m CONFIG_NET_VENDOR_MARVELL=y diff --git a/config/riscv64/default b/config/riscv64/default index 61bad30..d994163 100644 --- a/config/riscv64/default +++ b/config/riscv64/default @@ -3126,7 +3126,8 @@ CONFIG_FM10K=m CONFIG_IGC=m CONFIG_IDPF=m CONFIG_JME=m -# CONFIG_NET_VENDOR_ADI is not set +CONFIG_NET_VENDOR_ADI=y +CONFIG_ADIN1110=m CONFIG_NET_VENDOR_LITEX=y CONFIG_LITEX_LITEETH=m CONFIG_NET_VENDOR_MARVELL=y diff --git a/config/x86_64/default b/config/x86_64/default index 7dfde1f..a62a384 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -3475,7 +3475,8 @@ CONFIG_FM10K=m CONFIG_IGC=m CONFIG_IDPF=m CONFIG_JME=m -# CONFIG_NET_VENDOR_ADI is not set +CONFIG_NET_VENDOR_ADI=y +CONFIG_ADIN1110=m CONFIG_NET_VENDOR_LITEX=y CONFIG_NET_VENDOR_MARVELL=y # CONFIG_MVMDIO is not set diff --git a/patches.rpmify/net-ethernet-adi-move-PHYLIB-from-vendor-to-driver-s.patch b/patches.rpmify/net-ethernet-adi-move-PHYLIB-from-vendor-to-driver-s.patch new file mode 100644 index 0000000..451b77a --- /dev/null +++ b/patches.rpmify/net-ethernet-adi-move-PHYLIB-from-vendor-to-driver-s.patch @@ -0,0 +1,45 @@ +From: Randy Dunlap +Date: Sun, 25 Feb 2024 23:48:20 -0800 +Subject: net: ethernet: adi: move PHYLIB from vendor to driver symbol +Patch-mainline: submitted - 2024-02-26 - 20240226074820.29250-1-rdunlap@infradead.org +References: none + +In a previous patch I added "select PHYLIB" at the wrong place for the +ADIN1110 driver symbol, so move it to its correct place under the +ADIN1110 kconfig symbol. + +Fixes: a9f80df4f514 ("net: ethernet: adi: requires PHYLIB support") +Signed-off-by: Randy Dunlap +Reported-by: Michal Kubecek +Reported-by: Michal Kubecek +Closes: https://lore.kernel.org/lkml/77012b38-4b49-47f4-9a88-d773d52909ad@infradead.org/T/#m8ba397484738711edc0ad607b2c63ca02244e3c3 +Cc: Lennart Franzen +Cc: "David S. Miller" +Cc: Eric Dumazet +Cc: Jakub Kicinski +Cc: Paolo Abeni +Cc: netdev@vger.kernel.org +Cc: Nuno Sa +Acked-by: Michal Kubecek +--- + drivers/net/ethernet/adi/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/adi/Kconfig ++++ b/drivers/net/ethernet/adi/Kconfig +@@ -7,7 +7,6 @@ config NET_VENDOR_ADI + bool "Analog Devices devices" + default y + depends on SPI +- select PHYLIB + help + If you have a network (Ethernet) card belonging to this class, say Y. + +@@ -22,6 +21,7 @@ config ADIN1110 + tristate "Analog Devices ADIN1110 MAC-PHY" + depends on SPI && NET_SWITCHDEV + select CRC8 ++ select PHYLIB + help + Say yes here to build support for Analog Devices ADIN1110 + Low Power 10BASE-T1L Ethernet MAC-PHY. diff --git a/series.conf b/series.conf index 3b2cba2..2be27af 100644 --- a/series.conf +++ b/series.conf @@ -37,6 +37,7 @@ patches.rpmify/Revert-kconfig-only-write-CONFIG_FOO-is-not-set-for-.patch patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch + patches.rpmify/net-ethernet-adi-move-PHYLIB-from-vendor-to-driver-s.patch ######################################################## # The sorted section should contain all patches that are