ath79: disable ath79 USB phy drivers by default

We already have an kernel module package "kmod-phy-ath79-usb" to
drive the ath79 USB. It will be selected by the usb base package
"kmod-usb2" and "kmod-usb-ohci".

Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/16380
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/ath79/config-6.6 b/target/linux/ath79/config-6.6
index ed0e84e316cdb3dcd2ef7126633f414727dbd2b1..92057c343c09d17726d43ac7e1766d0ed2ffbd1d 100644 (file)
--- a/target/linux/ath79/config-6.6
+++ b/target/linux/ath79/config-6.6
@@ -52,6 +52,7 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_ETHERNET_PACKET_MANGLE=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_FIXED_PHY=y
+CONFIG_FORCE_NR_CPUS=y
 CONFIG_FS_IOMAP=y
 CONFIG_FUNCTION_ALIGNMENT=0
 CONFIG_FWNODE_MDIO=y

diff --git a/target/linux/ath79/generic/config-default b/target/linux/ath79/generic/config-default
index a37d341821bf0bcb531c21e3eba2f182743de612..1141d7ae4735399ed5bb0cfb83afa8fb728a874e 100644 (file)
--- a/target/linux/ath79/generic/config-default
+++ b/target/linux/ath79/generic/config-default
@@ -20,8 +20,6 @@ CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y
 CONFIG_MTD_SPLIT_EVA_FW=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_U_BOOT_ENV=y
-CONFIG_PHY_AR7100_USB=y
-CONFIG_PHY_AR7200_USB=y
 CONFIG_REALTEK_PHY=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y

diff --git a/target/linux/ath79/mikrotik/config-default b/target/linux/ath79/mikrotik/config-default
index 71b64b26ad535429c72d51d1e81f46fd9f68f222..0dd79d9adc0e48d5d373e820758b6d5170bbac2a 100644 (file)
--- a/target/linux/ath79/mikrotik/config-default
+++ b/target/linux/ath79/mikrotik/config-default
@@ -35,8 +35,6 @@ CONFIG_NET_DSA=y
 CONFIG_NET_SWITCHDEV=y
 # CONFIG_NVMEM_LAYOUT_MIKROTIK is not set
 CONFIG_PHYLINK=y
-CONFIG_PHY_AR7100_USB=y
-CONFIG_PHY_AR7200_USB=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_SGL_ALLOC=y
 CONFIG_SPI_RB4XX=y

diff --git a/target/linux/ath79/nand/config-default b/target/linux/ath79/nand/config-default
index dd47d2a3eab49950b0fd3fb924c6101eb832ddbd..71ce1caad7d400078ef811a641ff23fa588fad00 100644 (file)
--- a/target/linux/ath79/nand/config-default
+++ b/target/linux/ath79/nand/config-default
@@ -18,7 +18,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_BLOCK=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 # CONFIG_PCI_AR71XX is not set
-CONFIG_PHY_AR7200_USB=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_SGL_ALLOC=y

diff --git a/target/linux/ath79/tiny/config-default b/target/linux/ath79/tiny/config-default
index c738309ce491c89e9948fbe2db7706da60ec42ca..e47260df82056f27ed805a9f90b94983d7168794 100644 (file)
--- a/target/linux/ath79/tiny/config-default
+++ b/target/linux/ath79/tiny/config-default
@@ -8,6 +8,4 @@ CONFIG_NET_SWITCHDEV=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_PHYLINK=y
-CONFIG_PHY_AR7100_USB=y
-CONFIG_PHY_AR7200_USB=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y