Prechádzať zdrojové kódy

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
Kiran Venkatappa 8 rokov pred
rodič
commit
8c8390a7c2
3 zmenil súbory, kde vykonal 5 pridanie a 5 odobranie
  1. 1 1
      hif/inc/hostdef.h
  2. 2 2
      hif/inc/targetdef.h
  3. 2 2
      hif/src/regtable.c

+ 1 - 1
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

+ 2 - 2
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;
-extern struct ce_reg_def *QCA8074_CE_TARGETdef;
 #endif
+extern struct ce_reg_def *QCA8074_CE_TARGETdef;
 
 
 #endif

+ 2 - 2
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: