Add additionally supported devices to Kconfig description, add further requirements such as PHYLINK. Update driver name in usb_driver and update MODULE_DESCRIPTION to include the additionally supported chips. Change Kconfig symbol name from USB_NET_AX88179_178A to USB_NET_AX88179 and update loongson32_defconfig/loongson64_defconfig to use that symbol. Signed-off-by: Birger Koblitz Reviewed-by: Andrew Lunn Reviewed-by: Nicolai Buchwitz --- arch/loongarch/configs/loongson32_defconfig | 2 +- arch/loongarch/configs/loongson64_defconfig | 2 +- drivers/net/usb/Kconfig | 10 +++++++--- drivers/net/usb/Makefile | 2 +- drivers/net/usb/ax88179_178a.c | 8 ++++---- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/loongarch/configs/loongson32_defconfig b/arch/loongarch/configs/loongson32_defconfig index dbef879935f322e6167b4ed878ad4cb20048c6db..a039b8e8d242073c16ea281cf8734068a1a9b29f 100644 --- a/arch/loongarch/configs/loongson32_defconfig +++ b/arch/loongarch/configs/loongson32_defconfig @@ -641,7 +641,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m CONFIG_USB_USBNET=m # CONFIG_USB_NET_AX8817X is not set -# CONFIG_USB_NET_AX88179_178A is not set +# CONFIG_USB_NET_AX88179 is not set CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_HUAWEI_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m diff --git a/arch/loongarch/configs/loongson64_defconfig b/arch/loongarch/configs/loongson64_defconfig index 4f8bb77b8a1e6e30bcbd6e96d7e38b5054630ea0..b30415c03fa185cae77e81ded929c743ef22ee40 100644 --- a/arch/loongarch/configs/loongson64_defconfig +++ b/arch/loongarch/configs/loongson64_defconfig @@ -657,7 +657,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m CONFIG_USB_USBNET=m # CONFIG_USB_NET_AX8817X is not set -# CONFIG_USB_NET_AX88179_178A is not set +# CONFIG_USB_NET_AX88179 is not set CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_HUAWEI_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 115990b0d9537aea2776544c9768b034f32aa7a4..27862e380bdb4a54d184fa8618e4c9b348354e84 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig @@ -195,11 +195,12 @@ config USB_NET_AX8817X This driver creates an interface named "ethX", where X depends on what other networking devices you have in use. -config USB_NET_AX88179_178A - tristate "ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet" +config USB_NET_AX88179 + tristate "ASIX AX88179/179A/178A USB 2.0/3.0 to 100M/1G/2.5GbE Adapters" depends on USB_USBNET - select CRC32 select PHYLINK + select AX88796B_PHY + select CRC32 default y help This option adds support for ASIX AX88179 based USB 3.0/2.0 @@ -207,6 +208,9 @@ config USB_NET_AX88179_178A This driver should work with at least the following devices: * ASIX AX88179 + * ASIX AX88179A/B + * ASIX AX88279 + * ASIX AX88772D/E * ASIX AX88178A * Sitcomm LN-032 diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index 2ecead0181eaf8d66fb6f5dbd6f2905b22b6eb57..4026f19ecb826a6465de38f1d9bb0e4c0af80421 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -12,7 +12,7 @@ obj-$(CONFIG_USB_HSO) += hso.o obj-$(CONFIG_USB_LAN78XX) += lan78xx.o obj-$(CONFIG_USB_NET_AX8817X) += asix.o asix-y := asix_devices.o asix_common.o ax88172a.o -obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179.o +obj-$(CONFIG_USB_NET_AX88179) += ax88179.o ax88179-y := ax88179_178a.o ax88179a_devices.o ax88179_lib.o obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index 245ccf6896033922adcef79bd395b347918f57e3..8b52994e2a604101b61ec9cc0d698a0ecb520a14 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -1354,8 +1354,8 @@ static const struct usb_device_id products[] = { }; MODULE_DEVICE_TABLE(usb, products); -static struct usb_driver ax88179_178a_driver = { - .name = "ax88179_178a", +static struct usb_driver ax88179_driver = { + .name = "ax88179", .id_table = products, .probe = usbnet_probe, .suspend = ax88179_suspend_wrapper, @@ -1366,8 +1366,8 @@ static struct usb_driver ax88179_178a_driver = { .disable_hub_initiated_lpm = 1, }; -module_usb_driver(ax88179_178a_driver); +module_usb_driver(ax88179_driver); -MODULE_DESCRIPTION("ASIX AX88179/178A based USB 3.0/2.0 Gigabit Ethernet Devices"); +MODULE_DESCRIPTION("ASIX AX88179/179A/178A/279 based USB 3.0/2.0 100M/1G/2.5GbE Controllers"); MODULE_LICENSE("GPL"); MODULE_ALIAS("ax88179_178a"); -- 2.47.3