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

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

Merge "cnss2: Switch to official vendor/device ID for QCA6290"

parents 8ba1d75c 9417f758

drivers/net/wireless/cnss2/main.c

+8 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,7 @@ static int cnss_powerup(const struct subsys_desc *subsys_desc) 
	case QCA6174_DEVICE_ID:

		ret = cnss_qca6174_powerup(plat_priv);

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		ret = cnss_qca6290_powerup(plat_priv);

		break;
@@ -1102,6 +1103,7 @@ static int cnss_shutdown(const struct subsys_desc *subsys_desc, bool force_stop) 
	case QCA6174_DEVICE_ID:

		ret = cnss_qca6174_shutdown(plat_priv);

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		ret = cnss_qca6290_shutdown(plat_priv);

		break;
@@ -1186,6 +1188,7 @@ static int cnss_ramdump(int enable, const struct subsys_desc *subsys_desc) 
	case QCA6174_DEVICE_ID:

		ret = cnss_qca6174_ramdump(plat_priv);

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		ret = cnss_qca6290_ramdump(plat_priv);

		break;
@@ -1243,6 +1246,7 @@ static void cnss_crash_shutdown(const struct subsys_desc *subsys_desc) 
	case QCA6174_DEVICE_ID:

		cnss_qca6174_crash_shutdown(plat_priv);

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		cnss_qca6290_crash_shutdown(plat_priv);

		break;
@@ -1526,6 +1530,7 @@ int cnss_register_subsys(struct cnss_plat_data *plat_priv) 
	case QCA6174_DEVICE_ID:

		subsys_info->subsys_desc.name = "AR6320";

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		subsys_info->subsys_desc.name = "QCA6290";

		break;
@@ -1743,6 +1748,7 @@ int cnss_register_ramdump(struct cnss_plat_data *plat_priv) 
	case QCA6174_DEVICE_ID:

		ret = cnss_qca6174_register_ramdump(plat_priv);

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		ret = cnss_qca6290_register_ramdump(plat_priv);

		break;
@@ -1760,6 +1766,7 @@ void cnss_unregister_ramdump(struct cnss_plat_data *plat_priv) 
	case QCA6174_DEVICE_ID:

		cnss_qca6174_unregister_ramdump(plat_priv);

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		cnss_qca6290_unregister_ramdump(plat_priv);

		break;
@@ -1829,6 +1836,7 @@ static ssize_t cnss_fs_ready_store(struct device *dev, 
	}



	switch (plat_priv->device_id) {

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		break;

	default:

drivers/net/wireless/cnss2/pci.c

+5 −0
Original line number Diff line number Diff line
@@ -1368,6 +1368,7 @@ static int cnss_pci_probe(struct pci_dev *pci_dev, 
		    id->vendor, pci_dev->device);



	switch (pci_dev->device) {

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		if (!mhi_is_device_ready(&plat_priv->plat_dev->dev,

					 MHI_NODE_NAME)) {
@@ -1440,6 +1441,7 @@ static int cnss_pci_probe(struct pci_dev *pci_dev, 
				    ret);

		cnss_power_off_device(plat_priv);

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		ret = cnss_pci_enable_msi(pci_priv);

		if (ret)
@@ -1486,6 +1488,7 @@ static void cnss_pci_remove(struct pci_dev *pci_dev) 
	cnss_pci_free_fw_mem(pci_priv);



	switch (pci_dev->device) {

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

		cnss_pci_unregister_mhi(pci_priv);

		cnss_pci_disable_msi(pci_priv);
@@ -1505,6 +1508,8 @@ static void cnss_pci_remove(struct pci_dev *pci_dev) 


static const struct pci_device_id cnss_pci_id_table[] = {

	{ QCA6174_VENDOR_ID, QCA6174_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },

	{ QCA6290_EMULATION_VENDOR_ID, QCA6290_EMULATION_DEVICE_ID,

	  PCI_ANY_ID, PCI_ANY_ID },

	{ QCA6290_VENDOR_ID, QCA6290_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },

	{ 0 }

};

drivers/net/wireless/cnss2/pci.h

+4 −2
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ 
#define QCA6174_REV_ID_OFFSET		0x08

#define QCA6174_REV3_VERSION		0x5020000

#define QCA6174_REV3_2_VERSION		0x5030000

#define QCA6290_VENDOR_ID		0x168C

#define QCA6290_DEVICE_ID		0xABCD

#define QCA6290_VENDOR_ID		0x17CB

#define QCA6290_DEVICE_ID		0x1100

#define QCA6290_EMULATION_VENDOR_ID	0x168C

#define QCA6290_EMULATION_DEVICE_ID	0xABCD



enum cnss_mhi_state {

	CNSS_MHI_INIT,