Przeglądaj źródła

qcacmn: Add missing device IDs

Currently HMT, HSP_KAILUA, HSP_WAIPIO, NETRANI_HL, NETRANI_MSL
device ids are not present in host driver code.

To address this issue add these device ids in qwlan_hw_list array.

Change-Id: I6ab7399545204e1df6ada836b7ab092fab064b38
CRs-Fixed: 3271889
Asutosh Mohapatra 2 lat temu
rodzic
commit
19b08fc8ab
3 zmienionych plików z 43 dodań i 5 usunięć
  1. 6 1
      hif/src/hif_hw_version.h
  2. 33 4
      hif/src/hif_main.c
  3. 4 0
      hif/src/ipcie/if_ipci.c

+ 6 - 1
hif/src/hif_hw_version.h

@@ -34,13 +34,18 @@
 #define QCA9377_REV1_1_VERSION          0x5020001
 #define QCA6390_V1                      0x50040000
 #define QCA6490_V1                      0x50060000
-#define KIWI_V1                         0xDEADBEEF	// TODO Define this
 #define WCN3990_v1                      0x40000000
 #define WCN3990_v2                      0x40010000
 #define WCN3990_v2_1                    0x40010002
 #define WCN3998                         0x40030001
 #define AR900B_REV_2                    0x1
 #define MANGO_V1                        0xDEADBEEF	// TODO Define this
+#define KIWI_V1                         0x40170100
+#define KIWI_V2                         0x40170200
+#define QCA6490_v2_1                    0x400c1211
+#define QCA6490_v2                      0x400c0200
+#define WCN3990_v2_2                    0x400f0000
+#define WCN6750_V1                      0x40140110
 
 struct qwlan_hw {
 	u32 id;

+ 33 - 4
hif/src/hif_main.c

@@ -359,15 +359,40 @@ static const struct qwlan_hw qwlan_hw_list[] = {
 		.subid = 0xD,
 		.name = "QCA9379_REV1_1",
 	},
+	{
+		.id = MANGO_V1,
+		.subid = 0xF,
+		.name = "MANGO_V1",
+	},
 	{
 		.id = KIWI_V1,
-		.subid = 0xE,
+		.subid = 0,
 		.name = "KIWI_V1",
 	},
 	{
-		.id = MANGO_V1,
-		.subid = 0xF,
-		.name = "MANGO_V1",
+		.id = KIWI_V2,
+		.subid = 0,
+		.name = "KIWI_V2",
+	},
+	{
+		.id = WCN6750_V1,
+		.subid = 0,
+		.name = "WCN6750_V1",
+	},
+	{
+		.id = QCA6490_v2_1,
+		.subid = 0,
+		.name = "QCA6490",
+	},
+	{
+		.id = QCA6490_v2,
+		.subid = 0,
+		.name = "QCA6490",
+	},
+	{
+		.id = WCN3990_v2_2,
+		.subid = 0,
+		.name = "WCN3990_v2_2",
 	}
 };
 
@@ -381,6 +406,10 @@ static const char *hif_get_hw_name(struct hif_target_info *info)
 {
 	int i;
 
+	hif_debug("target version = %d, target revision = %d",
+		  info->target_version,
+		  info->target_revision);
+
 	if (info->hw_name)
 		return info->hw_name;
 

+ 4 - 0
hif/src/ipcie/if_ipci.c

@@ -775,11 +775,15 @@ static void hif_ipci_get_soc_info_pld(struct hif_ipci_softc *sc,
 				      struct device *dev)
 {
 	struct pld_soc_info info;
+	struct hif_softc *scn = HIF_GET_SOFTC(sc);
 
 	pld_get_soc_info(dev, &info);
 	sc->mem = info.v_addr;
 	sc->ce_sc.ol_sc.mem    = info.v_addr;
 	sc->ce_sc.ol_sc.mem_pa = info.p_addr;
+
+	scn->target_info.target_version = info.soc_id;
+	scn->target_info.target_revision = 0;
 }
 
 /**