Merge 129048b1 on remote branch

Change-Id: I3f8c5712cb7d08c5dffc8450aa9fd9ce043189f9

atoll/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

bengal/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

default/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

kona/BoardConfigWlan.mk

-BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/qca_cld3_wlan.ko
+BOARD_VENDOR_KERNEL_MODULES += $(foreach chip, $(TARGET_WLAN_CHIP), $(KERNEL_MODULES_OUT)/$(WLAN_CHIPSET)_$(chip).ko)
 
 WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wlan"
 WIFI_DRIVER_STATE_ON := "ON"

kona/wlan.mk

+# Add supported chips for autodetection
+TARGET_WLAN_CHIP := qca6390
+
 WLAN_CHIPSET := qca_cld3
 
 #WPA
 WPA := wpa_cli
 
-PRODUCT_PACKAGES += $(WLAN_CHIPSET)_wlan.ko
 PRODUCT_PACKAGES += wifilearner
 PRODUCT_PACKAGES += $(WPA)
 
@@ -11,13 +13,12 @@ PRODUCT_PACKAGES += $(WPA)
 WIFI_HIDL_FEATURE_AWARE := true
 
 PRODUCT_COPY_FILES += \
-    device/qcom/wlan/kona/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \
-				device/qcom/wlan/kona/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
-				device/qcom/wlan/kona/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
-				device/qcom/wlan/kona/icm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/icm.conf \
-                                frameworks/native/data/etc/android.hardware.wifi.aware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.aware.xml \
-                                frameworks/native/data/etc/android.hardware.wifi.rtt.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.rtt.xml \
-                                frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml
+			device/qcom/wlan/kona/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
+			device/qcom/wlan/kona/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
+			device/qcom/wlan/kona/icm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/icm.conf \
+			frameworks/native/data/etc/android.hardware.wifi.aware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.aware.xml \
+			frameworks/native/data/etc/android.hardware.wifi.rtt.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.rtt.xml \
+			frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml
 
 # Enable STA + SAP Concurrency.
 WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
@@ -27,3 +28,24 @@ QC_WIFI_HIDL_FEATURE_DUAL_AP := true
 
 # Enable STA + STA Feature.
 QC_WIFI_HIDL_FEATURE_DUAL_STA := true
+
+######## For multiple ko support ########
+
+# WLAN driver configuration file
+PRODUCT_COPY_FILES += \
+		      $(foreach chip, $(TARGET_WLAN_CHIP), \
+		      device/qcom/wlan/kona/WCNSS_qcom_cfg_$(chip).ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/$(chip)/WCNSS_qcom_cfg.ini)
+
+
+PRODUCT_PACKAGES += $(foreach chip, $(TARGET_WLAN_CHIP), $(WLAN_CHIPSET)_$(chip).ko)
+
+# Override WLAN configurations
+# Usage:
+# To disable WLAN_CFG_1/WLAN_CFG_3 and enable WLAN_CFG_2 for <wlan_chip>
+# (<wlan_chip> is from $TARGET_WLAN_CHIP).
+#  WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
+
+WLAN_CFG_OVERRIDE_qca6390 := CONFIG_CNSS_QCA6390=y
+
+# Use default_config for all chips. Used with TARGET_WLAN_CHIP.
+WLAN_CFG_USE_DEFAULT := true

kona/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

lahaina/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

lito/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

msmnile/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

msmnile_au/WCNSS_qcom_cfg_qcn7605.ini

@@ -474,7 +474,6 @@ gInterfaceChangeWait=20
 gBpfFilterEnable=0
 gActiveMcBcBpfMode=0 
 gSoftApMaxPeers=10
-gNumVdevs=3
 gRuntimePM=0
 
 gSetAntennaIsolation=30

msmnile_au/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

sdm710/wpa_supplicant_overlay.conf

@@ -3,3 +3,4 @@ p2p_disabled=1
 tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
+config_methods=virtual_display virtual_push_button keypad

sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini

@@ -473,7 +473,6 @@ gInterfaceChangeWait=20
 gBpfFilterEnable=0
 gActiveMcBcBpfMode=0 
 gSoftApMaxPeers=10
-gNumVdevs=3
 gRuntimePM=0
 END
 

sdmshrike_au/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

skunk/wpa_supplicant_overlay.conf

@@ -3,3 +3,4 @@ p2p_disabled=1
 tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
+config_methods=virtual_display virtual_push_button keypad

sm6150_au/WCNSS_qcom_cfg_qcn7605.ini

@@ -473,7 +473,6 @@ gInterfaceChangeWait=20
 gBpfFilterEnable=0
 gActiveMcBcBpfMode=0 
 gSoftApMaxPeers=10
-gNumVdevs=3
 gRuntimePM=0
 
 gSetAntennaIsolation=30

sm6150_au/wpa_supplicant_overlay.conf

 disable_scan_offload=1
 p2p_disabled=1
 wowlan_triggers=magic_pkt
+config_methods=virtual_display virtual_push_button keypad

talos/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad

trinket/wpa_supplicant_overlay.conf

@@ -4,3 +4,4 @@ tdls_external_control=1
 wowlan_triggers=magic_pkt
 bss_max_count=400
 interworking=1
+config_methods=virtual_display virtual_push_button keypad