diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 04c0466d160..075a1f12ba3 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -891,7 +891,7 @@ $(eval $(call KernelPackage,dsa-mxl862xx)) define KernelPackage/dsa-qca8k SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Qualcomm Atheros QCA8xxx switch family DSA support - DEPENDS:=+kmod-dsa +kmod-regmap-core +!LINUX_6_12:kmod-mdio-devres + DEPENDS:=+kmod-dsa +kmod-phy-qca83xx +kmod-regmap-core +!LINUX_6_12:kmod-mdio-devres KCONFIG:= \ CONFIG_NET_DSA_QCA8K \ CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y \ diff --git a/target/linux/apm821xx/image/nand.mk b/target/linux/apm821xx/image/nand.mk index 13d1a5bdb43..d8229f6352b 100644 --- a/target/linux/apm821xx/image/nand.mk +++ b/target/linux/apm821xx/image/nand.mk @@ -43,7 +43,7 @@ define Device/meraki_mx60 DEVICE_ALT0_VENDOR := Cisco Meraki DEVICE_ALT0_MODEL := MX60W DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ - kmod-usb-storage block-mount kmod-dsa-qca8k kmod-phy-qca83xx + kmod-usb-storage block-mount kmod-dsa-qca8k BLOCKSIZE := 128k PAGESIZE := 2048 SUBPAGESIZE := 512 @@ -102,7 +102,7 @@ define Device/netgear_wndr4700 kmod-dm kmod-fs-ext4 kmod-fs-vfat kmod-usb-ledtrig-usbport \ kmod-md-mod kmod-nls-cp437 kmod-nls-iso8859-1 kmod-nls-iso8859-15 \ kmod-nls-utf8 kmod-usb-xhci-pci-renesas kmod-usb-dwc2 kmod-usb-storage \ - partx-utils kmod-ata-dwc kmod-dsa-qca8k kmod-phy-qca83xx \ + partx-utils kmod-ata-dwc kmod-dsa-qca8k \ kmod-hwmon-tc654 kmod-hwmon-lm90 kmod-thermal BOARD_NAME := wndr4700 PAGESIZE := 2048 diff --git a/target/linux/ath79/image/mikrotik.mk b/target/linux/ath79/image/mikrotik.mk index 86cd35297e5..664bc81d081 100644 --- a/target/linux/ath79/image/mikrotik.mk +++ b/target/linux/ath79/image/mikrotik.mk @@ -95,7 +95,7 @@ define Device/mikrotik_routerboard-951g-2hnd $(Device/mikrotik_nand) SOC := ar9344 DEVICE_MODEL := RouterBOARD 951G-2HnD - DEVICE_PACKAGES += kmod-usb-ohci kmod-usb2 kmod-dsa-qca8k kmod-phy-qca83xx \ + DEVICE_PACKAGES += kmod-usb-ohci kmod-usb2 kmod-dsa-qca8k \ -swconfig -kmod-switch-ar8xxx DEVICE_COMPAT_MESSAGE := \ Switched to DSA. Cannot preserve the network config. @@ -147,7 +147,7 @@ define Device/mikrotik_routerboard-962uigs-5hact2hnt SOC := qca9558 DEVICE_MODEL := RouterBOARD 962UiGS-5HacT2HnT (hAP ac) DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct kmod-usb2 \ - kmod-i2c-gpio kmod-sfp kmod-dsa-qca8k kmod-phy-qca83xx \ + kmod-i2c-gpio kmod-sfp kmod-dsa-qca8k \ -swconfig -kmod-switch-ar8xxx IMAGE_SIZE := 16256k DEVICE_COMPAT_MESSAGE := \ diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk index a86b2203698..a96d0eb4eee 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk @@ -186,7 +186,7 @@ define Device/avm_fritz5490 DEVICE_VARIANT := Other NAND KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-dsa-qca8k kmod-phy-qca83xx kmod-usb-xhci-pci-renesas \ + DEVICE_PACKAGES := kmod-dsa-qca8k kmod-usb-xhci-pci-renesas \ fritz-tffs xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware \ -ltq-vdsl-vr9-vectoring-fw-installer -kmod-ltq-vdsl-vr9-mei \ -kmod-ltq-vdsl-vr9 -kmod-ltq-atm-vr9 -kmod-ltq-ptm-vr9 \ @@ -205,7 +205,7 @@ define Device/avm_fritz5490-micron DEVICE_VARIANT := Micron NAND KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-dsa-qca8k kmod-phy-qca83xx kmod-usb-xhci-pci-renesas \ + DEVICE_PACKAGES := kmod-dsa-qca8k kmod-usb-xhci-pci-renesas \ fritz-tffs xrx200-rev1.1-phy11g-firmware xrx200-rev1.2-phy11g-firmware \ -ltq-vdsl-vr9-vectoring-fw-installer -kmod-ltq-vdsl-vr9-mei \ -kmod-ltq-vdsl-vr9 -kmod-ltq-atm-vr9 -kmod-ltq-ptm-vr9 \ diff --git a/target/linux/mpc85xx/image/p1010.mk b/target/linux/mpc85xx/image/p1010.mk index 337101a71c8..7be266fb34e 100644 --- a/target/linux/mpc85xx/image/p1010.mk +++ b/target/linux/mpc85xx/image/p1010.mk @@ -17,7 +17,7 @@ endef define Device/aerohive_br200-wp DEVICE_VENDOR := Aerohive DEVICE_MODEL := BR200-WP - DEVICE_PACKAGES := kmod-dsa-qca8k kmod-phy-qca83xx + DEVICE_PACKAGES := kmod-dsa-qca8k BLOCKSIZE := 128k KERNEL_NAME := simpleImage.br200-wp KERNEL := kernel-bin | uImage none @@ -55,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 kmod-dsa-qca8k kmod-phy-qca83xx + DEVICE_PACKAGES := kmod-usb-ledtrig-usbport kmod-dsa-qca8k TPLINK_HEADER_VERSION := 1 TPLINK_HWID := 0x49000001 TPLINK_HWREV := 1