[openwrt/openwrt] ath79: disable ath79 USB phy drivers by default

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/04bdf9b3323e1d8caa04af4a930100894b2b869b

commit 04bdf9b3323e1d8caa04af4a930100894b2b869b
Author: Shiji Yang <yangshiji66 at qq.com>
AuthorDate: Fri Sep 13 19:52:30 2024 +0800

    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 <yangshiji66 at qq.com>
    Link: https://github.com/openwrt/openwrt/pull/16380
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 target/linux/ath79/config-6.6              | 1 +
 target/linux/ath79/generic/config-default  | 2 --
 target/linux/ath79/mikrotik/config-default | 2 --
 target/linux/ath79/nand/config-default     | 1 -
 target/linux/ath79/tiny/config-default     | 2 --
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/target/linux/ath79/config-6.6 b/target/linux/ath79/config-6.6
index ed0e84e316..92057c343c 100644
--- 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 a37d341821..1141d7ae47 100644
--- 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 71b64b26ad..0dd79d9adc 100644
--- 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 dd47d2a3ea..71ce1caad7 100644
--- 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 c738309ce4..e47260df82 100644
--- 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