mpc85xx: use modules for DSA drivers

Use the proper drivers for each device.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/24076
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/mpc85xx/image/p1010.mk b/target/linux/mpc85xx/image/p1010.mk
index 9a4c0d84e425ce2142222aa452eba15c04b3011c..337101a71c83545008f21550085c095466a3b7c2 100644 (file)
--- a/target/linux/mpc85xx/image/p1010.mk
+++ b/target/linux/mpc85xx/image/p1010.mk
@@ -17,6 +17,7 @@ endef
 define Device/aerohive_br200-wp
   DEVICE_VENDOR := Aerohive
   DEVICE_MODEL := BR200-WP
+  DEVICE_PACKAGES := kmod-dsa-qca8k kmod-phy-qca83xx
   BLOCKSIZE := 128k
   KERNEL_NAME := simpleImage.br200-wp
   KERNEL := kernel-bin | uImage none
@@ -37,6 +38,7 @@ TARGET_DEVICES += aerohive_br200-wp
 define Device/enterasys_ws-ap3715i
   DEVICE_VENDOR := Enterasys
   DEVICE_MODEL := WS-AP3715i
+  DEVICE_PACKAGES := kmod-phy-at803x
   BLOCKSIZE := 64k
   KERNEL_NAME := simpleImage.ws-ap3715i
   KERNEL_ENTRY := 0x1500000
@@ -53,7 +55,7 @@ define Device/tplink_tl-wdr4900-v1
   DEVICE_VARIANT := v1
   DEVICE_COMPAT_VERSION := 1.1
   DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
-  DEVICE_PACKAGES := kmod-usb-ledtrig-usbport
+  DEVICE_PACKAGES := kmod-usb-ledtrig-usbport kmod-dsa-qca8k kmod-phy-qca83xx
   TPLINK_HEADER_VERSION := 1
   TPLINK_HWID := 0x49000001
   TPLINK_HWREV := 1
@@ -79,7 +81,7 @@ define Device/watchguard_firebox-t10
   DEVICE_MODEL := Firebox T10
   DEVICE_ALT0_VENDOR := Watchguard
   DEVICE_ALT0_MODEL := Firebox T10-W
-  DEVICE_PACKAGES := kmod-rtc-s35390a kmod-eeprom-at24
+  DEVICE_PACKAGES := kmod-rtc-s35390a kmod-eeprom-at24 kmod-phy-at803x
   # This boot loader doesn't reliably boot an uncompressed image,
   # therefore resort to gzipping the already compressed zImage
   KERNEL = kernel-bin | libdeflate-gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb
@@ -96,7 +98,7 @@ define Device/watchguard_firebox-t15
   DEVICE_MODEL := Firebox T15
   DEVICE_ALT0_VENDOR := Watchguard
   DEVICE_ALT0_MODEL := Firebox T15-W
-  DEVICE_PACKAGES := kmod-rtc-s35390a kmod-eeprom-at24
+  DEVICE_PACKAGES := kmod-rtc-s35390a kmod-eeprom-at24 kmod-phy-at803x
   # This boot loader doesn't reliably boot an uncompressed image,
   # therefore resort to gzipping the already compressed zImage
   KERNEL = kernel-bin | libdeflate-gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb
@@ -112,6 +114,7 @@ define Device/sophos_red-15w-rev1
   DEVICE_VENDOR := Sophos
   DEVICE_MODEL := RED 15w
   DEVICE_VARIANT := Rev.1
+  DEVICE_PACKAGES := kmod-phy-realtek
   # Original firmware uses a dedicated DTB-partition.
   # The bootloader however supports FIT-images.
   KERNEL = kernel-bin | libdeflate-gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb

diff --git a/target/linux/mpc85xx/image/p1020.mk b/target/linux/mpc85xx/image/p1020.mk
index 9e989891bc4ba7dc235284335db35e81bce45ad1..583cf5da7a438b337d11e095e48746cd3def1760 100644 (file)
--- a/target/linux/mpc85xx/image/p1020.mk
+++ b/target/linux/mpc85xx/image/p1020.mk
@@ -15,7 +15,7 @@ define Device/aerohive_hiveap-330
   DEVICE_MODEL := HiveAP-330
   DEVICE_ALT0_VENDOR := Aerohive
   DEVICE_ALT0_MODEL := HiveAP-350
-  DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-hwmon-lm70
+  DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-hwmon-lm70 kmod-phy-at803x
   BLOCKSIZE := 128k
   KERNEL := kernel-bin | uImage none
   KERNEL_INITRAMFS := kernel-bin | uImage none
@@ -66,6 +66,7 @@ TARGET_DEVICES += aerohive_hiveap-330
 define Device/enterasys_ws-ap3710i
   DEVICE_VENDOR := Enterasys
   DEVICE_MODEL := WS-AP3710i
+  DEVICE_PACKAGES := kmod-phy-at803x
   BLOCKSIZE := 128k
   KERNEL_NAME := simpleImage.ws-ap3710i
   KERNEL_ENTRY := 0x3000000
@@ -80,7 +81,7 @@ TARGET_DEVICES += enterasys_ws-ap3710i
 define Device/extreme-networks_ws-ap3825i
   DEVICE_VENDOR := Extreme Networks
   DEVICE_MODEL := WS-AP3825i
-  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-phy-at803x
   BLOCKSIZE := 128k
   KERNEL_NAME := simpleImage.ws-ap3825i
   KERNEL_ENTRY := 0x3000000
@@ -98,6 +99,7 @@ define Device/hpe_msm460
   DEVICE_ALT0_MODEL := MSM430
   DEVICE_ALT1_VENDOR := Hewlett-Packard
   DEVICE_ALT1_MODEL := MSM466
+  DEVICE_PACKAGES := kmod-phy-marvell
   KERNEL = kernel-bin | fit none $(KDIR)/image-$$(DEVICE_DTS).dtb
   KERNEL_NAME := zImage.la3000000
   KERNEL_ENTRY := 0x3000000
@@ -116,7 +118,7 @@ TARGET_DEVICES += hpe_msm460
 define Device/ocedo_panda
   DEVICE_VENDOR := OCEDO
   DEVICE_MODEL := Panda
-  DEVICE_PACKAGES := kmod-rtc-ds1307
+  DEVICE_PACKAGES := kmod-rtc-ds1307 kmod-dsa-b53-mdio kmod-phy-broadcom
   KERNEL = kernel-bin | libdeflate-gzip | fit gzip $(KDIR)/image-$$(DEVICE_DTS).dtb
   PAGESIZE := 2048
   SUBPAGESIZE := 512

diff --git a/target/linux/mpc85xx/p1010/config-default b/target/linux/mpc85xx/p1010/config-default
index 8b27c8b122bd278630d417f3a38e640906102541..49b05ff4bcf6be70b23e69e3bf4e240a0f173621 100644 (file)
--- a/target/linux/mpc85xx/p1010/config-default
+++ b/target/linux/mpc85xx/p1010/config-default
@@ -5,24 +5,13 @@ CONFIG_FIREBOX_T1X=y
 # CONFIG_FSL_CORENET_CF is not set
 CONFIG_FSL_IFC=y
 CONFIG_GPIO_74X164=y
-CONFIG_GRO_CELLS=y
 CONFIG_MEMORY=y
 CONFIG_MTD_NAND_FSL_IFC=y
 CONFIG_MTD_SPLIT_TPLINK_FW=y
 CONFIG_MTD_SPLIT_UIMAGE_FW=y
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NET_DEVLINK=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_QCA8K=y
-CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y
-CONFIG_NET_DSA_TAG_QCA=y
-CONFIG_PHY_COMMON_PROPS=y
 CONFIG_PPC_ZIMAGE_LA3000000=y
-CONFIG_QCA83XX_PHY=y
-CONFIG_QCOM_NET_PHYLIB=y
-CONFIG_REALTEK_PHY=y
 CONFIG_RED_15W_REV1=y
-CONFIG_REGMAP=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_SPI_BITBANG=y

diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default
index f24ea2abc0728dddb4b3895286e87c6de0004220..06eebb575d0cd5bbcf4a29030dddca91dc782c18 100644 (file)
--- a/target/linux/mpc85xx/p1020/config-default
+++ b/target/linux/mpc85xx/p1020/config-default
@@ -1,8 +1,3 @@
-CONFIG_AT803X_PHY=y
-CONFIG_B53=y
-CONFIG_B53_MDIO_DRIVER=y
-CONFIG_BCM_NET_PHYLIB=y
-CONFIG_BROADCOM_PHY=y
 CONFIG_CONTEXT_TRACKING=y
 CONFIG_CONTEXT_TRACKING_IDLE=y
 CONFIG_CPU_RMAP=y
@@ -13,7 +8,6 @@ CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_TBSYNC=y
 CONFIG_GPIO_74X164=y
 # CONFIG_GPIO_MAX77620 is not set
-CONFIG_GRO_CELLS=y
 CONFIG_HIVEAP_330=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_LEDS_LP5521=y
@@ -29,19 +23,10 @@ CONFIG_MTD_SPLIT_FIT_FW=y
 CONFIG_MTD_SPLIT_UIMAGE_FW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_NEED_PER_CPU_KM is not set
-CONFIG_NET_DEVLINK=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_COMMON=y
-CONFIG_NET_DSA_TAG_BRCM_LEGACY=y
-CONFIG_NET_DSA_TAG_BRCM_LEGACY_FCS=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-CONFIG_NET_DSA_TAG_NONE=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NR_CPUS=2
 CONFIG_PANDA=y
 CONFIG_PPC_ZIMAGE_LA3000000=y
-CONFIG_QCOM_NET_PHYLIB=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y