From ec93ab0efa2d2ecc0326b4473cc44bb6c251baf6 Mon Sep 17 00:00:00 2001
From: Houston Hoffman <hhoffman@codeaurora.org>
Date: Tue, 3 May 2016 20:09:55 -0700
Subject: [PATCH] qcacmn: Remove qwlan_hw_list from hif_hw_version.h

Preparation to include hif_hw_version.h in ol_fw.h

Change-Id: If4395a9e05071f7b1239e1b2d7af2cc24b6d8339
CRs-Fixed: 1012824
---
 hif/src/hif_hw_version.h | 54 ++++------------------------------------
 hif/src/hif_main.c       | 48 +++++++++++++++++++++++++++++++++++
 hif/src/pcie/if_pci.c    |  2 +-
 3 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/hif/src/hif_hw_version.h b/hif/src/hif_hw_version.h
index d5d76dc059..e02bd2e55d 100644
--- a/hif/src/hif_hw_version.h
+++ b/hif/src/hif_hw_version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -29,12 +29,16 @@
 #ifndef HIF_HW_VERSION_H
 #define HIF_HW_VERSION_H
 
+#define AR6004_VERSION_REV1_3           0x31c8088a
+#define AR9888_REV2_VERSION             0x4100016c
 #define AR6320_REV1_VERSION             0x5000000
 #define AR6320_REV1_1_VERSION           0x5000001
 #define AR6320_REV1_3_VERSION           0x5000003
 #define AR6320_REV2_1_VERSION           0x5010000
 #define AR6320_REV3_VERSION             0x5020000
 #define AR6320_REV3_2_VERSION           0x5030000
+#define AR6320_DEV_VERSION              0x1000000
+
 
 struct qwlan_hw {
 	u32 id;
@@ -42,52 +46,4 @@ struct qwlan_hw {
 	const char *name;
 };
 
-static const struct qwlan_hw qwlan_hw_list[] = {
-	{
-		.id = AR6320_REV1_VERSION,
-		.subid = 0,
-		.name = "QCA6174_REV1",
-	},
-	{
-		.id = AR6320_REV1_1_VERSION,
-		.subid = 0x1,
-		.name = "QCA6174_REV1_1",
-	},
-	{
-		.id = AR6320_REV1_3_VERSION,
-		.subid = 0x2,
-		.name = "QCA6174_REV1_3",
-	},
-	{
-		.id = AR6320_REV2_1_VERSION,
-		.subid = 0x4,
-		.name = "QCA6174_REV2_1",
-	},
-	{
-		.id = AR6320_REV2_1_VERSION,
-		.subid = 0x5,
-		.name = "QCA6174_REV2_2",
-	},
-	{
-		.id = AR6320_REV3_VERSION,
-		.subid = 0x6,
-		.name = "QCA6174_REV2.3",
-	},
-	{
-		.id = AR6320_REV3_VERSION,
-		.subid = 0x8,
-		.name = "QCA6174_REV3",
-	},
-	{
-		.id = AR6320_REV3_VERSION,
-		.subid = 0x9,
-		.name = "QCA6174_REV3_1",
-	},
-	{
-		.id = AR6320_REV3_2_VERSION,
-		.subid = 0xA,
-		.name = "AR6320_REV3_2_VERSION",
-	}
-};
-
 #endif /* HIF_HW_VERSION_H */
diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c
index 9df3bd5103..a8f3d69595 100644
--- a/hif/src/hif_main.c
+++ b/hif/src/hif_main.c
@@ -348,6 +348,54 @@ void hif_save_htc_htt_config_endpoint(struct hif_opaque_softc *hif_ctx,
 	scn->htc_htt_tx_endpoint = htc_htt_tx_endpoint;
 }
 
+static const struct qwlan_hw qwlan_hw_list[] = {
+	{
+		.id = AR6320_REV1_VERSION,
+		.subid = 0,
+		.name = "QCA6174_REV1",
+	},
+	{
+		.id = AR6320_REV1_1_VERSION,
+		.subid = 0x1,
+		.name = "QCA6174_REV1_1",
+	},
+	{
+		.id = AR6320_REV1_3_VERSION,
+		.subid = 0x2,
+		.name = "QCA6174_REV1_3",
+	},
+	{
+		.id = AR6320_REV2_1_VERSION,
+		.subid = 0x4,
+		.name = "QCA6174_REV2_1",
+	},
+	{
+		.id = AR6320_REV2_1_VERSION,
+		.subid = 0x5,
+		.name = "QCA6174_REV2_2",
+	},
+	{
+		.id = AR6320_REV3_VERSION,
+		.subid = 0x6,
+		.name = "QCA6174_REV2.3",
+	},
+	{
+		.id = AR6320_REV3_VERSION,
+		.subid = 0x8,
+		.name = "QCA6174_REV3",
+	},
+	{
+		.id = AR6320_REV3_VERSION,
+		.subid = 0x9,
+		.name = "QCA6174_REV3_1",
+	},
+	{
+		.id = AR6320_REV3_2_VERSION,
+		.subid = 0xA,
+		.name = "AR6320_REV3_2_VERSION",
+	}
+};
+
 /**
  * hif_get_hw_name(): get a human readable name for the hardware
  * @info: Target Info
diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c
index fc57fae076..47e513cdef 100644
--- a/hif/src/pcie/if_pci.c
+++ b/hif/src/pcie/if_pci.c
@@ -42,7 +42,7 @@
 #include "ce_reg.h"
 #include "ce_bmi.h"
 #include "regtable.h"
-#include "ol_fw.h"
+#include "hif_hw_version.h"
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include "qdf_status.h"