Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1372e64 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Add support for QCN7605 ver 2 usb device support"

parents 8d4a9db1 8e839de5

drivers/net/wireless/cnss2/bus.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/cnss2/bus.h

+5 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/cnss2/main.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/cnss2/qmi.c

+3 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/wireless/cnss2/usb.c

+10 −0
Original line number Diff line number Diff line
@@ -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 */

};