From 7d5cca0a9614f29efb74b68d9d533d3ebd512715 Mon Sep 17 00:00:00 2001
From: Jon Lin <jon.lin@rock-chips.com>
Date: Tue, 5 Mar 2024 10:37:55 +0800
Subject: [PATCH] net: wireless: rockchip_wlan: bcmdhd: Remove
 CUSTOMER_HW_ROCKCHIP_RK3588 limitation for L1SS

Only using CONFIG_PCIEASPM_ROCKCHIP_WIFI_EXTENSION macro limitaition.

Change-Id: Ice14105ef12704f6639dc37398b5d872dca7fb0c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
---
 drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile | 2 +-
 .../net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c  | 6 +++---
 .../wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_pcie_linux.c | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
index a501cb4286c7..8d38196e43a7 100755
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
@@ -414,7 +414,7 @@ endif
 endif
 
 ifneq ($(CONFIG_BCMDHD_PCIE),)
-ifneq ($(filter -DCUSTOMER_HW_ROCKCHIP_RK3588, $(DHDCFLAGS)),)
+ifeq ($(CONFIG_PCIEASPM_ROCKCHIP_WIFI_EXTENSION),y)
  DHDCFLAGS += -DDHD_CONTROL_PCIE_ASPM_WIFI_TURNON
 endif
 endif
diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c
index 7bc7bd1c36f2..95d3a06711ab 100755
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux.c
@@ -65,9 +65,9 @@
 #include <asm/unaligned.h>
 #include <dhd_linux_priv.h>
 #ifdef BCMPCIE
-#if defined(CUSTOMER_HW_ROCKCHIP) && defined(CUSTOMER_HW_ROCKCHIP_RK3588)
+#if defined(CUSTOMER_HW_ROCKCHIP)
 #include <rk_dhd_pcie_linux.h>
-#endif /* CUSTOMER_HW_ROCKCHIP && CUSTOMER_HW_ROCKCHIP_RK3588 */
+#endif /* CUSTOMER_HW_ROCKCHIP */
 #endif /* BCMPCIE */
 
 #include <epivers.h>
@@ -10055,7 +10055,7 @@ dhd_bus_start(dhd_pub_t *dhdp)
 	}
 
 #ifdef BCMPCIE
-#if defined(CUSTOMER_HW_ROCKCHIP) && defined(CUSTOMER_HW_ROCKCHIP_RK3588)
+#if defined(CUSTOMER_HW_ROCKCHIP)
 	if (IS_ENABLED(CONFIG_PCIEASPM_ROCKCHIP_WIFI_EXTENSION))
 		rk_dhd_bus_l1ss_enable_rc_ep(dhdp->bus, TRUE);
 #endif /* CUSTOMER_HW_ROCKCHIP && BCMPCIE */
diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_pcie_linux.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_pcie_linux.c
index 4bd08d8fbc23..1edae2dc649f 100755
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_pcie_linux.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_pcie_linux.c
@@ -47,9 +47,9 @@
 #include <pcicfg.h>
 #include <dhd_pcie.h>
 #include <dhd_linux.h>
-#if defined(CUSTOMER_HW_ROCKCHIP) && defined(CUSTOMER_HW_ROCKCHIP_RK3588)
+#if defined(CUSTOMER_HW_ROCKCHIP)
 #include <rk_dhd_pcie_linux.h>
-#endif /* CUSTOMER_HW_ROCKCHIP && CUSTOMER_HW_ROCKCHIP_RK3588 */
+#endif /* CUSTOMER_HW_ROCKCHIP */
 #ifdef CONFIG_ARCH_MSM
 #if IS_ENABLED(CONFIG_PCI_MSM) || defined(CONFIG_ARCH_MSM8996)
 #include <linux/msm_pcie.h>
@@ -614,7 +614,7 @@ dhd_bus_is_rc_ep_l1ss_capable(dhd_bus_t *bus)
 	uint32 rc_l1ss_cap;
 	uint32 ep_l1ss_cap;
 
-#if defined(CUSTOMER_HW_ROCKCHIP) && defined(CUSTOMER_HW_ROCKCHIP_RK3588)
+#if defined(CUSTOMER_HW_ROCKCHIP)
 	if (IS_ENABLED(CONFIG_PCIEASPM_ROCKCHIP_WIFI_EXTENSION)) {
 		if (rk_dhd_bus_is_rc_ep_l1ss_capable(bus)) {
 			DHD_ERROR(("%s L1ss is capable\n", __FUNCTION__));
@@ -624,7 +624,7 @@ dhd_bus_is_rc_ep_l1ss_capable(dhd_bus_t *bus)
 			return FALSE;
 		}
 	}
-#endif /* CUSTOMER_HW_ROCKCHIP && CUSTOMER_HW_ROCKCHIP_RK3588 */
+#endif /* CUSTOMER_HW_ROCKCHIP */
 
 	/* RC Extendend Capacility */
 	rc_l1ss_cap = dhdpcie_access_cap(bus->rc_dev, PCIE_EXTCAP_ID_L1SS,