diff options
| -rw-r--r-- | drivers/net/wireless/cnss2/bus.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/cnss2/bus.h | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/cnss2/main.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/cnss2/qmi.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/cnss2/usb.c | 10 |
5 files changed, 26 insertions, 1 deletions
diff --git a/drivers/net/wireless/cnss2/bus.c b/drivers/net/wireless/cnss2/bus.c index 5f1187c66c7e..088593f9ae1c 100644 --- a/drivers/net/wireless/cnss2/bus.c +++ b/drivers/net/wireless/cnss2/bus.c @@ -41,6 +41,8 @@ enum cnss_dev_bus_type cnss_get_bus_type(unsigned long device_id) return CNSS_BUS_PCI; case QCN7605_COMPOSITE_DEVICE_ID: case QCN7605_STANDALONE_DEVICE_ID: + case QCN7605_VER20_STANDALONE_DEVICE_ID: + case QCN7605_VER20_COMPOSITE_DEVICE_ID: return CNSS_BUS_USB; default: cnss_pr_err("Unknown device_id: 0x%lx\n", device_id); diff --git a/drivers/net/wireless/cnss2/bus.h b/drivers/net/wireless/cnss2/bus.h index f9168c3ade93..1100fd66482a 100644 --- a/drivers/net/wireless/cnss2/bus.h +++ b/drivers/net/wireless/cnss2/bus.h @@ -30,10 +30,15 @@ #define QCN7605_USB_VENDOR_ID 0x05C6 #define QCN7605_COMPOSITE_DEVICE_ID QCN7605_COMPOSITE_PRODUCT_ID #define QCN7605_STANDALONE_DEVICE_ID QCN7605_STANDALONE_PRODUCT_ID +#define QCN7605_VER20_STANDALONE_DEVICE_ID QCN7605_VER20_STANDALONE_PID +#define QCN7605_VER20_COMPOSITE_DEVICE_ID QCN7605_VER20_COMPOSITE_PID #define QCN7605_STANDALONE_PRODUCT_ID 0x9900 #define QCN7605_COMPOSITE_PRODUCT_ID 0x9901 +#define QCN7605_VER20_STANDALONE_PID 0x9902 +#define QCN7605_VER20_COMPOSITE_PID 0x9903 + enum cnss_dev_bus_type cnss_get_dev_bus_type(struct device *dev); enum cnss_dev_bus_type cnss_get_bus_type(unsigned long device_id); void *cnss_bus_dev_to_bus_priv(struct device *dev); diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c index 63579cac88c4..66a7f4694d96 100644 --- a/drivers/net/wireless/cnss2/main.c +++ b/drivers/net/wireless/cnss2/main.c @@ -1357,6 +1357,8 @@ int cnss_register_subsys(struct cnss_plat_data *plat_priv) case QCN7605_DEVICE_ID: case QCN7605_STANDALONE_DEVICE_ID: case QCN7605_COMPOSITE_DEVICE_ID: + case QCN7605_VER20_STANDALONE_DEVICE_ID: + case QCN7605_VER20_COMPOSITE_DEVICE_ID: subsys_info->subsys_desc.name = "QCN7605"; break; default: @@ -1579,6 +1581,8 @@ int cnss_register_ramdump(struct cnss_plat_data *plat_priv) break; case QCN7605_COMPOSITE_DEVICE_ID: case QCN7605_STANDALONE_DEVICE_ID: + case QCN7605_VER20_STANDALONE_DEVICE_ID: + case QCN7605_VER20_COMPOSITE_DEVICE_ID: break; default: @@ -1601,6 +1605,8 @@ void cnss_unregister_ramdump(struct cnss_plat_data *plat_priv) break; case QCN7605_COMPOSITE_DEVICE_ID: case QCN7605_STANDALONE_DEVICE_ID: + case QCN7605_VER20_STANDALONE_DEVICE_ID: + case QCN7605_VER20_COMPOSITE_DEVICE_ID: break; default: cnss_pr_err("Unknown device ID: 0x%lx\n", plat_priv->device_id); diff --git a/drivers/net/wireless/cnss2/qmi.c b/drivers/net/wireless/cnss2/qmi.c index 30ac0cc9ad51..d86213175495 100644 --- a/drivers/net/wireless/cnss2/qmi.c +++ b/drivers/net/wireless/cnss2/qmi.c @@ -794,7 +794,9 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv) if (plat_priv->device_id == QCN7605_DEVICE_ID || plat_priv->device_id == QCN7605_COMPOSITE_DEVICE_ID || - plat_priv->device_id == QCN7605_STANDALONE_DEVICE_ID) + plat_priv->device_id == QCN7605_STANDALONE_DEVICE_ID || + plat_priv->device_id == QCN7605_VER20_STANDALONE_DEVICE_ID || + plat_priv->device_id == QCN7605_VER20_COMPOSITE_DEVICE_ID) bdf_type = CNSS_BDF_BIN; if (plat_priv->board_info.board_id == 0xFF) diff --git a/drivers/net/wireless/cnss2/usb.c b/drivers/net/wireless/cnss2/usb.c index 29b9a00ce156..b196e9f6bc9b 100644 --- a/drivers/net/wireless/cnss2/usb.c +++ b/drivers/net/wireless/cnss2/usb.c @@ -170,6 +170,8 @@ int cnss_usb_dev_shutdown(struct cnss_usb_data *usb_priv) switch (usb_priv->device_id) { case QCN7605_COMPOSITE_DEVICE_ID: case QCN7605_STANDALONE_DEVICE_ID: + case QCN7605_VER20_STANDALONE_DEVICE_ID: + case QCN7605_VER20_COMPOSITE_DEVICE_ID: cnss_pr_dbg("cnss driver state %lu\n", plat_priv->driver_state); if (!test_bit(CNSS_DEV_REMOVED, &plat_priv->driver_state)) cnss_usb_call_driver_remove(usb_priv); @@ -301,6 +303,8 @@ static int cnss_usb_probe(struct usb_interface *interface, switch (usb_priv->device_id) { case QCN7605_COMPOSITE_DEVICE_ID: case QCN7605_STANDALONE_DEVICE_ID: + case QCN7605_VER20_STANDALONE_DEVICE_ID: + case QCN7605_VER20_COMPOSITE_DEVICE_ID: break; default: cnss_pr_err("Unknown USB device found: 0x%x\n", @@ -380,6 +384,12 @@ static struct usb_device_id cnss_usb_id_table[] = { { USB_DEVICE_INTERFACE_NUMBER(QCN7605_USB_VENDOR_ID, QCN7605_STANDALONE_PRODUCT_ID, QCN7605_WLAN_STANDALONE_INTERFACE_NUM) }, + { USB_DEVICE_INTERFACE_NUMBER(QCN7605_USB_VENDOR_ID, + QCN7605_VER20_STANDALONE_PID, + QCN7605_WLAN_STANDALONE_INTERFACE_NUM) }, + { USB_DEVICE_INTERFACE_NUMBER(QCN7605_USB_VENDOR_ID, + QCN7605_VER20_COMPOSITE_PID, + QCN7605_WLAN_COMPOSITE_INTERFACE_NUM) }, {} /* Terminating entry */ }; |