From 8c8390a7c245c46c0722878a1b0ccb1b5948d65a Mon Sep 17 00:00:00 2001
From: Kiran Venkatappa <kiranv@codeaurora.org>
Date: Wed, 19 Oct 2016 14:58:31 +0530
Subject: [PATCH] qcacmn: Move regdef for qca8074 out of AHB compiler flag

X86 uses PCI to connect to qca8074. ATH_AHB is not enabled on x86
but regdef is required to set correct offset for registers. Move the
initialization code out of ATH_AHB compiler flag.

Change-Id: I369f9c87e006fa3ae929e18a6922332d84f01382
CRs-Fixed: 1079647
---
 hif/inc/hostdef.h   | 2 +-
 hif/inc/targetdef.h | 4 ++--
 hif/src/regtable.c  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hif/inc/hostdef.h b/hif/inc/hostdef.h
index da330ba243..a4186fab5d 100644
--- a/hif/inc/hostdef.h
+++ b/hif/inc/hostdef.h
@@ -35,7 +35,7 @@ extern struct hostdef_s *QCA9984_HOSTdef;
 extern struct hostdef_s *QCA9888_HOSTdef;
 #ifdef ATH_AHB
 extern struct hostdef_s *IPQ4019_HOSTdef;
-extern struct hostdef_s *QCA8074_HOSTdef;
 #endif
+extern struct hostdef_s *QCA8074_HOSTdef;
 
 #endif
diff --git a/hif/inc/targetdef.h b/hif/inc/targetdef.h
index 7c16d041f5..d2d3e9b24f 100644
--- a/hif/inc/targetdef.h
+++ b/hif/inc/targetdef.h
@@ -35,8 +35,8 @@ extern struct targetdef_s *QCA9984_TARGETdef;
 extern struct targetdef_s *QCA9888_TARGETdef;
 #ifdef ATH_AHB
 extern struct targetdef_s *IPQ4019_TARGETdef;
-extern struct targetdef_s *QCA8074_TARGETdef;
 #endif
+extern struct targetdef_s *QCA8074_TARGETdef;
 
 extern struct ce_reg_def *AR6002_CE_TARGETdef;
 extern struct ce_reg_def *AR6003_CE_TARGETdef;
@@ -49,8 +49,8 @@ extern struct ce_reg_def *QCA9984_CE_TARGETdef;
 extern struct ce_reg_def *QCA9888_CE_TARGETdef;
 #ifdef ATH_AHB
 extern struct ce_reg_def *IPQ4019_CE_TARGETdef;
+#endif
 extern struct ce_reg_def *QCA8074_CE_TARGETdef;
-#endif
 
 
 #endif
diff --git a/hif/src/regtable.c b/hif/src/regtable.c
index f96c7689c3..f64a731f3c 100644
--- a/hif/src/regtable.c
+++ b/hif/src/regtable.c
@@ -103,12 +103,12 @@ void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
 		scn->target_ce_def = IPQ4019_CE_TARGETdef;
 		break;
 #endif
+#endif
 #if defined(QCA8074_HEADERS_DEF)
 	case TARGET_TYPE_QCA8074:
 		scn->targetdef = QCA8074_TARGETdef;
 		scn->target_ce_def = QCA8074_CE_TARGETdef;
 		break;
-#endif
 #endif
 
 	default:
@@ -173,11 +173,11 @@ void hif_register_tbl_attach(struct hif_softc *scn, u32 hif_type)
 		scn->hostdef = IPQ4019_HOSTdef;
 		break;
 #endif
+#endif
 #if defined(QCA8074_HEADERS_DEF)
 	case HIF_TYPE_QCA8074:
 		scn->hostdef = QCA8074_HOSTdef;
 		break;
-#endif
 #endif
 
 	default: