From d81f5b148d88556d9343a4c9f515c695918d9a81 Mon Sep 17 00:00:00 2001
From: Abhiram Jogadenu <ajogaden@codeaurora.org>
Date: Tue, 12 Feb 2019 12:05:59 +0530
Subject: [PATCH] qcacmn: hal and spectral kbuild changes for CFR

Adding hal support and including CFR libs in spectral's ko.
CRs-Fixed: 2372061

Change-Id: I7545c594fd2a004f9d34835414549bd51ff09e4f
---
 hal/wifi3.0/qca8074v2/hal_8074v2.c | 5 +++--
 spectral/Kbuild                    | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hal/wifi3.0/qca8074v2/hal_8074v2.c b/hal/wifi3.0/qca8074v2/hal_8074v2.c
index 9d46341b44a1..2539b26b2a79 100644
--- a/hal/wifi3.0/qca8074v2/hal_8074v2.c
+++ b/hal/wifi3.0/qca8074v2/hal_8074v2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 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
@@ -526,7 +526,8 @@ struct hal_hw_srng_config hw_srng_table_8074v2[] = {
 	},
 	{ /* DIR_BUF_RX_DMA_SRC */
 		.start_ring_id = HAL_SRNG_DIR_BUF_RX_SRC_DMA_RING,
-		.max_rings = 1,
+		/* one ring for spectral and one ring for cfr */
+		.max_rings = 2,
 		.entry_size = 2,
 		.lmac_ring = TRUE,
 		.ring_dir = HAL_SRNG_SRC_RING,
diff --git a/spectral/Kbuild b/spectral/Kbuild
index 30db776197a0..def4ad292ab6 100644
--- a/spectral/Kbuild
+++ b/spectral/Kbuild
@@ -185,6 +185,11 @@ ccflags-y+= -DWLAN_SA_API_ENABLE
 INCS += -I$(obj)/$(DEPTH)/umac/sa_api/dispatcher/inc
 endif
 
+ifeq ($(QCA_CFR_SUPPORT), 1)
+ccflags-y+= -DWLAN_CFR_ENABLE=1
+INCS += -I$(obj)/$(DEPTH)/component_dev/umac/cfr/dispatcher/inc
+endif
+
 ifeq ($(strip ${QCA_DFS_COMPONENT_ENABLE}),1)
 ccflags-y+= -DDFS_COMPONENT_ENABLE
 endif