net: bcmdhd: Fix build error without AMLOGIC_WIFI 64/293664/1
authorSeung-Woo Kim <sw0312.kim@samsung.com>
Thu, 1 Jun 2023 09:27:54 +0000 (18:27 +0900)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Thu, 1 Jun 2023 09:29:42 +0000 (18:29 +0900)
Fix build error without CONFIG_AMLOGIC_WIFI.

Change-Id: Ice94923cb40d653fd0fcc0102c0f03131f1eeedb
Fixes: 20f1a0173d60 ("VIM3/VIM3L: add bcmdhd driver")
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
drivers/net/wireless/bcmdhd/Makefile
drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
drivers/net/wireless/bcmdhd/dhd_gpio.c

index 27335ce..2ebf852 100644 (file)
@@ -136,7 +136,9 @@ ifeq ($(CONFIG_BCMDHD_DTS),y)
 else
        DHDCFLAGS += -DCUSTOMER_HW -DDHD_OF_SUPPORT
 endif
+ifeq ($(CONFIG_AMLOGIC_WIFI),y)
        DHDCFLAGS += -DCUSTOMER_HW_AMLOGIC
+endif
 #      DHDCFLAGS += -DBCMWAPI_WPI -DBCMWAPI_WAI
 endif
 
@@ -145,7 +147,9 @@ ifeq ($(CONFIG_BCMDHD_AG),y)
 endif
 
 ifeq ($(CONFIG_DHD_USE_STATIC_BUF),y)
-#      obj-m += dhd_static_buf.o
+ifneq ($(CONFIG_AMLOGIC_WIFI),y)
+       obj-m += dhd_static_buf.o
+endif
        DHDCFLAGS += -DSTATIC_WL_PRIV_STRUCT -DENHANCED_STATIC_BUF
        DHDCFLAGS += -DDHD_USE_STATIC_MEMDUMP -DCONFIG_DHD_USE_STATIC_BUF
 endif
index a19a6bf..fb7837b 100644 (file)
@@ -723,9 +723,11 @@ sdioh_enable_hw_oob_intr(sdioh_info_t *sd, bool enable)
        uint8 data;
 
        if (enable) {
+#ifdef CUSTOMER_HW_AMLOGIC
                if (wifi_irq_trigger_level() == GPIO_IRQ_LOW)
                        data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;
                else
+#endif
                        data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE | SDIO_SEPINT_ACT_HI;
        }
        else
index a120bd3..5c9df08 100644 (file)
@@ -333,9 +333,11 @@ int dhd_wlan_init_gpio(void)
 
 #ifdef HW_OOB
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
+#ifdef CUSTOMER_HW_AMLOGIC
        if (wifi_irq_trigger_level() == GPIO_IRQ_LOW)
                host_oob_irq_flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL | IORESOURCE_IRQ_SHAREABLE;
        else
+#endif
                host_oob_irq_flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL | IORESOURCE_IRQ_SHAREABLE;
 #else
 #ifdef HW_OOB_LOW_LEVEL