wil6210: recognize Talyn JTAG ID

Add Talyn JTAG ID to the list of valid IDs
and identify this device as Talyn.

Signed-off-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index f8c7a6b..2b3b1f7 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -73,6 +73,10 @@ void wil_set_capabilities(struct wil6210_priv *wil)
                        break;
                }
                break;
+       case JTAG_DEV_ID_TALYN:
+               wil->hw_name = "Talyn";
+               wil->hw_version = HW_VER_TALYN;
+               break;
        default:
                wil_err(wil, "Unknown board hardware, chip_id 0x%08x, chip_revision 0x%08x\n",
                        jtag_id, chip_revision);

diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 0a0766b..a59a553 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2017 Qualcomm Atheros, Inc.
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -286,6 +287,7 @@ struct RGF_ICR {
 
 #define RGF_USER_JTAG_DEV_ID   (0x880b34) /* device ID */
        #define JTAG_DEV_ID_SPARROW     (0x2632072f)
+       #define JTAG_DEV_ID_TALYN       (0x7e0e1)
 
 #define RGF_USER_REVISION_ID           (0x88afe4)
 #define RGF_USER_REVISION_ID_MASK      (3)
@@ -300,6 +302,7 @@ enum {
        HW_VER_UNKNOWN,
        HW_VER_SPARROW_B0, /* REVISION_ID_SPARROW_B0 */
        HW_VER_SPARROW_D0, /* REVISION_ID_SPARROW_D0 */
+       HW_VER_TALYN,   /* JTAG_DEV_ID_TALYN */
 };
 
 /* popular locations */