Allow the Faraday vendor menu and FTGMAC100 driver to be selected on ARM64 so AST2700 platforms can enable the MAC. The driver now programs the upper DMA address fields, so it no longer needs to be marked BROKEN for 64-bit builds. AST2700 has no dedicated MACH_ASPEED_G7 symbol; unlike the 32-bit generations it is only gated by the common ARCH_ASPEED symbol. On 32-bit Aspeed platforms, arch/arm/mach-aspeed/Kconfig nests MACH_ASPEED_G4/G5/G6 under "if ARCH_ASPEED", so MACH_ASPEED_G6 already implies ARCH_ASPEED and is redundant once ARCH_ASPEED is part of the condition. Drop it and select MDIO_ASPEED directly on ARCH_ASPEED. This does widen the MDIO_ASPEED select beyond AST2600: it is now also selected for AST2400/AST2500, which keep driving their embedded MDIO controller from FTGMAC100 itself and have no MDIO node for this driver to bind to, so it is built but stays unused there. Update the MDIO_ASPEED help text to describe this. Signed-off-by: Jacky Chou --- drivers/net/ethernet/faraday/Kconfig | 7 +++---- drivers/net/mdio/Kconfig | 16 ++++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig index 474073c7f94d..9acc2d260c1f 100644 --- a/drivers/net/ethernet/faraday/Kconfig +++ b/drivers/net/ethernet/faraday/Kconfig @@ -6,7 +6,7 @@ config NET_VENDOR_FARADAY bool "Faraday devices" default y - depends on ARM || COMPILE_TEST + depends on ARM || ARM64 || COMPILE_TEST help If you have a network (Ethernet) card belonging to this class, say Y. @@ -28,11 +28,10 @@ config FTMAC100 config FTGMAC100 tristate "Faraday FTGMAC100 Gigabit Ethernet support" - depends on ARM || COMPILE_TEST - depends on !64BIT || BROKEN + depends on ARM || ARM64 || COMPILE_TEST select PHYLIB select FIXED_PHY - select MDIO_ASPEED if MACH_ASPEED_G6 + select MDIO_ASPEED if ARCH_ASPEED select CRC32 help This driver supports the FTGMAC100 Gigabit Ethernet controller diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig index d44278f26fab..d784782c230f 100644 --- a/drivers/net/mdio/Kconfig +++ b/drivers/net/mdio/Kconfig @@ -50,12 +50,16 @@ config MDIO_ASPEED depends on OF_MDIO && HAS_IOMEM help This module provides a driver for the independent MDIO bus - controllers found in the ASPEED AST2600 SoC. This is a driver for the - third revision of the ASPEED MDIO register interface - the first two - revisions are the "old" and "new" interfaces found in the AST2400 and - AST2500, embedded in the MAC. For legacy reasons, FTGMAC100 driver - continues to drive the embedded MDIO controller for the AST2400 and - AST2500 SoCs, so say N if AST2600 support is not required. + controllers found in the ASPEED AST2600 and AST2700 SoCs. This is a + driver for the third revision of the ASPEED MDIO register interface - + the first two revisions are the "old" and "new" interfaces found in + the AST2400 and AST2500, embedded in the MAC. For legacy reasons, + FTGMAC100 driver continues to drive the embedded MDIO controller for + the AST2400 and AST2500 SoCs. AST2700 has no dedicated MACH_ASPEED_G7 + symbol and is only gated by ARCH_ASPEED, so FTGMAC100 now + unconditionally selects this driver on every ARCH_ASPEED platform, + including the older AST2400/AST2500 SoCs where it has no MDIO node to + bind to. config MDIO_BITBANG tristate "Bitbanged MDIO buses" -- 2.34.1