Ares r oss

arch/arm64/configs/ares_user_defconfig

@@ -509,3 +509,8 @@ CONFIG_MTK_VOW_GVA_SUPPORT=n
 CONFIG_MTK_VOW_PCMCALLBACK_SUPPORT=n
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
 CONFIG_MI_ESD_CHECK=y
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_WLAN_DRV_BUILD_IN=y

drivers/gpu/drm/mediatek/mtk_dsi.c

@@ -362,7 +362,7 @@ static bool mtk_dsi_doze_state(struct mtk_dsi *dsi)
 	return state->prop_val[CRTC_PROP_DOZE_ACTIVE];
 }
 
-bool get_dsi_doze_state()
+bool get_dsi_doze_state(void)
 {
 	struct mtk_dsi *dsi = NULL;
 	struct drm_crtc *crtc = NULL;

drivers/input/touchscreen/Kconfig

@@ -13,7 +13,6 @@ source "drivers/input/touchscreen/mediatek/Kconfig"
 
 if INPUT_TOUCHSCREEN
 
-source "drivers/input/touchscreen/focaltech_spi/Kconfig"
 source "drivers/input/touchscreen/xiaomi/Kconfig"
 config TOUCHSCREEN_PROPERTIES
 	def_tristate INPUT

drivers/input/touchscreen/Makefile

@@ -105,7 +105,6 @@ obj-$(CONFIG_TOUCHSCREEN_ZET6223)	+= zet6223.o
 obj-$(CONFIG_TOUCHSCREEN_ZFORCE)	+= zforce_ts.o
 obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50)	+= colibri-vf50-ts.o
 obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023)	+= rohm_bu21023.o
-obj-$(CONFIG_TOUCHSCREEN_FOCALTECH) += focaltech_spi/
 obj-$(CONFIG_TOUCHSCREEN_XIAOMI_TOUCHFEATURE) += xiaomi/
 TOUCH_LISTS := $(subst ",,$(CONFIG_TOUCHSCREEN_MTK_TOUCH))
 obj-n += $(foreach TOUCH,$(TOUCH_LISTS),$(TOUCH)/)

drivers/misc/mediatek/connectivity/Kconfig

@@ -440,3 +440,10 @@ config MTK_CONNSYS_DEDICATED_LOG_PATH
 	     (by EMI or other specific path)
 	  2. The scope may include (but not limited) Wi-Fi firmware log,
 	     BT firmware log, GPS firmware log etc.
+
+config WLAN_DRV_BUILD_IN
+	bool "Build Wlan module in kernel"
+	help
+	  This will build the wlan driver and the corresponding componenets
+	  into the kernel.
+	  If unsure say n

drivers/misc/mediatek/connectivity/Makefile

@@ -41,53 +41,24 @@ endif
 
 
     # Do build-in for Makefile checking
-    # export CONFIG_WLAN_DRV_BUILD_IN=y
+    export CONFIG_WLAN_DRV_BUILD_IN=y
 
     ifeq ($(CONFIG_WLAN_DRV_BUILD_IN),y)
-        $(info $$CONFIG_MTK_COMBO_CHIP is [${CONFIG_MTK_COMBO_CHIP}])
         MTK_PLATFORM_ID := $(patsubst CONSYS_%,%,$(subst ",,$(CONFIG_MTK_COMBO_CHIP)))
-        $(info MTK_PLATFORM_ID is [${MTK_PLATFORM_ID}])
 
         ifneq (,$(filter $(CONFIG_MTK_COMBO_CHIP), "CONSYS_6885" "CONSYS_6893"))
             export MTK_COMBO_CHIP=CONNAC2X2_SOC3_0
-            PATH_TO_WMT_DRV      = vendor/mediatek/kernel_modules/connectivity/conninfra
+            PATH_TO_WMT_DRV      = conninfra
         else ifneq (,$(filter $(CONFIG_MTK_COMBO_CHIP), "CONSYS_6779" "CONSYS_6873" "CONSYS_6853"))
             export MTK_COMBO_CHIP=CONNAC2X2
-            PATH_TO_WMT_DRV      = vendor/mediatek/kernel_modules/connectivity/common
+            PATH_TO_WMT_DRV      = common
         else
             export MTK_COMBO_CHIP=CONNAC
-            PATH_TO_WMT_DRV      = vendor/mediatek/kernel_modules/connectivity/common
+            PATH_TO_WMT_DRV      = common
         endif
 
-        PATH_TO_WLAN_CHR_DRV = vendor/mediatek/kernel_modules/connectivity/wlan/adaptor
-        PATH_TO_WLAN_DRV     = vendor/mediatek/kernel_modules/connectivity/wlan/core/gen4m
-
-        ABS_PATH_TO_WMT_DRV      = $(srctree)/../$(PATH_TO_WMT_DRV)
-        ABS_PATH_TO_WLAN_CHR_DRV = $(srctree)/../$(PATH_TO_WLAN_CHR_DRV)
-        ABS_PATH_TO_WLAN_DRV     = $(srctree)/../$(PATH_TO_WLAN_DRV)
-
-        # check wlan driver folder
-        ifeq (,$(wildcard $(ABS_PATH_TO_WMT_DRV)))
-            $(error $(ABS_PATH_TO_WMT_DRV) is not existed)
-        endif
-        ifeq (,$(wildcard $(ABS_PATH_TO_WLAN_CHR_DRV)))
-            $(error $(ABS_PATH_TO_WLAN_CHR_DRV) is not existed)
-        endif
-        ifeq (,$(wildcard $(ABS_PATH_TO_WLAN_DRV)))
-            $(error $(ABS_PATH_TO_WLAN_DRV) is not existed)
-        endif
-
-        $(warning symbolic link to $(PATH_TO_WMT_DRV))
-        $(warning symbolic link to $(PATH_TO_WLAN_CHR_DRV))
-        $(warning symbolic link to $(PATH_TO_WLAN_DRV))
-
-        $(shell unlink $(srctree)/$(src)/wmt_drv)
-        $(shell unlink $(srctree)/$(src)/wmt_chrdev_wifi)
-        $(shell unlink $(srctree)/$(src)/wlan_drv_gen4m)
-
-        $(shell ln -s $(ABS_PATH_TO_WMT_DRV)      $(srctree)/$(src)/wmt_drv)
-        $(shell ln -s $(ABS_PATH_TO_WLAN_CHR_DRV) $(srctree)/$(src)/wmt_chrdev_wifi)
-        $(shell ln -s $(ABS_PATH_TO_WLAN_DRV)     $(srctree)/$(src)/wlan_drv_gen4m)
+        PATH_TO_WLAN_CHR_DRV = wlan/adaptor
+        PATH_TO_WLAN_DRV     = wlan/core/gen4m
 
         # for gen4m options
         export CONFIG_MTK_COMBO_WIFI_HIF=axi
@@ -100,73 +71,57 @@ endif
         WLAN_IP_SET_2_SERIES := 3967 6785
         WLAN_IP_SET_3_SERIES := 6779 6873 6853
         ifneq ($(filter $(WLAN_IP_SET_3_SERIES), $(WLAN_CHIP_ID)),)
-            $(info WIFI_IP_SET is 3)
             export WIFI_IP_SET=3
         else ifneq ($(filter $(WLAN_IP_SET_2_SERIES), $(WLAN_CHIP_ID)),)
-            $(info WIFI_IP_SET is 2)
             export WIFI_IP_SET=2
         else
-            $(info WIFI_IP_SET is 1)
             export WIFI_IP_SET=1
         endif
 
         # Do build-in for xxx.c checking
         subdir-ccflags-y += -D MTK_WCN_REMOVE_KERNEL_MODULE
         subdir-ccflags-y += -D MTK_WCN_BUILT_IN_DRIVER
-        obj-y += wmt_drv/
-        obj-y += wmt_chrdev_wifi/
-        obj-y += wlan_drv_gen4m/
+        obj-y += $(PATH_TO_WMT_DRV)/
+        obj-y += $(PATH_TO_WLAN_CHR_DRV)/
+        obj-y += $(PATH_TO_WLAN_DRV)/
 
         # For BT built-in mode start @{
-        # ifneq (,$(filter $(CONFIG_MTK_COMBO_CHIP), "CONSYS_6885"))
-        #     PATH_TO_BT_DRV       = vendor/mediatek/kernel_modules/connectivity/bt/mt66xx/connac2
-        #     export _MTK_BT_CHIP=MTK_CONSYS_MT6885
-        # else ifneq (,$(filter $(CONFIG_MTK_COMBO_CHIP), "CONSYS_6893"))
-        #     PATH_TO_BT_DRV       = vendor/mediatek/kernel_modules/connectivity/bt/mt66xx/connac2
-        #     export _MTK_BT_CHIP=MTK_CONSYS_MT6893
-        # else
-        #     PATH_TO_BT_DRV       = vendor/mediatek/kernel_modules/connectivity/bt/mt66xx/legacy
-        # endif
-        # ABS_PATH_TO_BT_DRV       = $(srctree)/../$(PATH_TO_BT_DRV)
-        # $(shell unlink $(srctree)/$(src)/bt)
-        # $(shell ln -s $(ABS_PATH_TO_BT_DRV)      $(srctree)/$(src)/bt)
-        # obj-y += bt/
+        ifneq (,$(filter $(CONFIG_MTK_COMBO_CHIP), "CONSYS_6885"))
+            PATH_TO_BT_DRV       = bt/mt66xx/connac2
+            export _MTK_BT_CHIP=MTK_CONSYS_MT6885
+        else ifneq (,$(filter $(CONFIG_MTK_COMBO_CHIP), "CONSYS_6893"))
+            PATH_TO_BT_DRV       = bt/mt66xx/connac2
+            export _MTK_BT_CHIP=MTK_CONSYS_MT6893
+        else
+            PATH_TO_BT_DRV       = bt/mt66xx/legacy
+        endif
+        obj-y += $(PATH_TO_BT_DRV)/
         # @} For BT built-in mode end
 
 
         # For FM built-in mode start @{
         # for fmradio options
-        # ifneq (,$(filter $(CONFIG_MTK_COMBO_CHIP), "CONSYS_6885" "CONSYS_6893"))
-        #     export CFG_BUILD_CONNAC2=true
-        # else
-        #     export CFG_BUILD_CONNAC2=false
-        # endif
-        # FM_6631_CHIPS := 6758 6759 6771 6775 6765 6761 3967 6797 6768 6785 8168
-        # FM_6635_CHIPS := 6779 6885 6873 6893
-        # ifneq ($(filter $(FM_6631_CHIPS), $(MTK_PLATFORM_ID)),)
-        #     FM_CHIP := mt6631
-        # else ifneq ($(filter $(FM_6635_CHIPS), $(MTK_PLATFORM_ID)),)
-        #     FM_CHIP := mt6635
-        # endif
-        # export CFG_FM_CHIP_ID=$(MTK_PLATFORM_ID)
-        # export CFG_FM_CHIP=$(FM_CHIP)
-        # PATH_TO_FMRADIO_DRV       = vendor/mediatek/kernel_modules/connectivity/fmradio
-        # ABS_PATH_TO_FMRADIO_DRV  = $(srctree)/../$(PATH_TO_FMRADIO_DRV)
-        # $(shell unlink $(srctree)/$(src)/fmradio)
-        # $(shell ln -s $(ABS_PATH_TO_FMRADIO_DRV)      $(srctree)/$(src)/fmradio)
-        # obj-y += fmradio/
+        ifneq (,$(filter $(CONFIG_MTK_COMBO_CHIP), "CONSYS_6885" "CONSYS_6893"))
+            export CFG_BUILD_CONNAC2=true
+        else
+            export CFG_BUILD_CONNAC2=false
+        endif
+        FM_6631_CHIPS := 6758 6759 6771 6775 6765 6761 3967 6797 6768 6785 8168
+        FM_6635_CHIPS := 6779 6885 6873 6893
+        ifneq ($(filter $(FM_6631_CHIPS), $(MTK_PLATFORM_ID)),)
+            FM_CHIP := mt6631
+        else ifneq ($(filter $(FM_6635_CHIPS), $(MTK_PLATFORM_ID)),)
+            FM_CHIP := mt6635
+        endif
+        export CFG_FM_CHIP_ID=$(MTK_PLATFORM_ID)
+        export CFG_FM_CHIP=$(FM_CHIP)
+        PATH_TO_FMRADIO_DRV       = fmradio
+        obj-y += $(PATH_TO_FMRADIO_DRV)/
         # @} For FM built-in mode end
 
         # For GPS built-in mode start @{
-        # PATH_TO_GPS_DRV      = vendor/mediatek/kernel_modules/connectivity/gps
-        # ABS_PATH_TO_GPS_DRV      = $(srctree)/../$(PATH_TO_GPS_DRV)
-        # ifeq (,$(wildcard $(ABS_PATH_TO_GPS_DRV)))
-        #     $(error $(ABS_PATH_TO_GPS_DRV) is not existed)
-        # endif
-        # $(warning symbolic link to $(PATH_TO_GPS_DRV))
-        # $(shell unlink $(srctree)/$(src)/gps_drv)
-        # $(shell ln -s $(ABS_PATH_TO_GPS_DRV)      $(srctree)/$(src)/gps_drv)
-        # obj-y += gps_drv/
+        PATH_TO_GPS_DRV      = gps
+        obj-y += $(PATH_TO_GPS_DRV)/
         # @} For GPS built-in mode end
 
     endif

drivers/misc/mediatek/connectivity/bt/mt66xx/Android.mk

@@ -0,0 +1,11 @@
+ifeq ($(MTK_BT_SUPPORT), yes)
+ifeq ($(filter MTK_MT76%, $(MTK_BT_CHIP)),)
+$(info MTK_BT_CHIP=$(MTK_BT_CHIP))
+
+ifeq ($(MTK_BT_CHIP), $(filter $(MTK_BT_CHIP), MTK_CONSYS_MT6885 MTK_CONSYS_MT6893))
+	include $(call all-subdir-makefiles, connac2)
+else
+	include $(call all-subdir-makefiles, legacy)
+endif
+endif
+endif

drivers/misc/mediatek/connectivity/bt/mt66xx/README

@@ -0,0 +1,2 @@
+Bluetooth driver - kernel modules move out of kernel tree
+

drivers/misc/mediatek/connectivity/bt/mt66xx/connac2/Android.mk

@@ -0,0 +1,21 @@
+LOCAL_PATH := $(call my-dir)
+
+ifneq (true,$(strip $(TARGET_NO_KERNEL)))
+ifeq ($(MTK_BT_CHIP), $(filter $(MTK_BT_CHIP), MTK_CONSYS_MT6885 MTK_CONSYS_MT6893))
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := bt_drv.ko
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_OWNER := mtk
+
+LOCAL_INIT_RC := init.bt_drv.rc
+LOCAL_SRC_FILES := $(patsubst $(LOCAL_PATH)/%,%,$(shell find $(LOCAL_PATH) -type f -name '*.[cho]')) Makefile
+LOCAL_REQUIRED_MODULES := conninfra.ko
+
+include $(MTK_KERNEL_MODULE)
+
+BT_OPTS += _MTK_BT_CHIP=$(MTK_BT_CHIP)
+BT_OPTS += _MTK_PLAT_MT6885_EMULATION=$(MTK_PLAT_MT6885_EMULATION)
+$(linked_module): OPTS += $(BT_OPTS)
+endif
+endif

drivers/misc/mediatek/connectivity/bt/mt66xx/connac2/Android.mk_disable

@@ -0,0 +1,27 @@
+LOCAL_PATH := $(call my-dir)
+
+ifneq (true,$(strip $(TARGET_NO_KERNEL)))
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := bt_drv.ko
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_OWNER := mtk
+
+LOCAL_INIT_RC := init.bt_drv.rc
+LOCAL_SRC_FILES := $(patsubst $(LOCAL_PATH)/%,%,$(shell find $(LOCAL_PATH) -type f -name '*.[cho]')) Makefile
+LOCAL_REQUIRED_MODULES := conninfra.ko
+
+include $(MTK_KERNEL_MODULE)
+
+#### Copy Module.symvers from $(LOCAL_REQUIRED_MODULES) to this module #######
+#### For symbol link (when CONFIG_MODVERSIONS is defined)
+CONN_INFRA_EXPORT_SYMBOL := $(subst $(LOCAL_MODULE),$(LOCAL_REQUIRED_MODULES),$(intermediates)/LINKED)/Module.symvers
+$(CONN_INFRA_EXPORT_SYMBOL): $(subst $(LOCAL_MODULE),$(LOCAL_REQUIRED_MODULES),$(linked_module))
+BT_EXPORT_SYMBOL := $(intermediates)/LINKED/Module.symvers
+$(BT_EXPORT_SYMBOL).in: $(intermediates)/LINKED/% : $(CONN_INFRA_EXPORT_SYMBOL)
+	$(copy-file-to-target)
+	cp $(CONN_INFRA_EXPORT_SYMBOL) $(BT_EXPORT_SYMBOL)
+
+$(linked_module): $(BT_EXPORT_SYMBOL).in
+
+endif

drivers/misc/mediatek/connectivity/bt/mt66xx/connac2/Makefile

@@ -0,0 +1,108 @@
+MTK_PLATFORM := $(subst ",,$(CONFIG_MTK_PLATFORM))
+###############################################################################
+# Bluetooth character device driver
+
+###############################################################################
+# Necessary Check
+
+ifneq ($(KERNEL_OUT),)
+    ccflags-y += -imacros $(KERNEL_OUT)/include/generated/autoconf.h
+endif
+
+CONNAC20_CHIPID=$(subst MTK_CONSYS_MT,,$(_MTK_BT_CHIP))
+ccflags-y += -D CONNAC20_CHIPID=$(CONNAC20_CHIPID)
+
+# only for sw-ready-go
+ifeq ($(_MTK_BT_CHIP), MTK_CONSYS_MT6893)
+ifneq ($(filter yes, $(_MTK_PLAT_MT6885_EMULATION)),)
+    ccflags-y += -D CONNAC20_CHIPID=6885
+endif
+endif
+
+ccflags-y += -Wno-error
+
+ifndef TOP
+    TOP := $(srctree)/..
+endif
+
+USE_DEVICE_NODE := y
+#CUSTOMER_FW_UPDATE := y
+
+ccflags-y += -DCHIP_IF_BTIF
+
+# Customized feature, load 1b fw bin
+#ccflags-y += -D BT_CUS_FEATURE
+
+# Force build fail on modpost warning
+KBUILD_MODPOST_FAIL_ON_WARNINGS := y
+###############################################################################
+
+# ---------------------------------------------------
+# Compile Options
+# ---------------------------------------------------
+ccflags-y += -D CREATE_NODE_DYNAMIC=1
+
+ifeq ($(CUSTOMER_FW_UPDATE), y)
+ccflags-y += -D CUSTOMER_FW_UPDATE=1
+else
+ccflags-y += -D CUSTOMER_FW_UPDATE=0
+endif
+
+ifneq ($(CFG_BT_PM_QOS_CONTROL),)
+    $(warning set PM_QOS_CONTROL=1)
+    ccflags-y += -D PM_QOS_CONTROL=1
+else
+    ccflags-y += -D PM_QOS_CONTROL=0
+endif
+
+# ---------------------------------------------------
+# Include Path
+# ---------------------------------------------------
+CONN_INFRA_SRC := $(srctree)/drivers/misc/mediatek/connectivity/conninfra
+WMT_SRC := $(srctree)/drivers/misc/mediatek/connectivity/common
+BTIF_SRC := $(srctree)/drivers/misc/mediatek/btif
+ccflags-y += -I$(srctree)/drivers/misc/mediatek/connectivity/common
+ccflags-y += -I$(CONN_INFRA_SRC)/include
+ccflags-y += -I$(CONN_INFRA_SRC)/base/include
+ccflags-y += -I$(CONN_INFRA_SRC)/conf/include
+ccflags-y += -I$(CONN_INFRA_SRC)/debug_utility/include
+ccflags-y += -I$(CONN_INFRA_SRC)/debug_utility/
+ifneq ($(CONFIG_MTK_CONNSYS_DEDICATED_LOG_PATH),)
+ccflags-y += -I$(WMT_SRC)/debug_utility
+endif
+ccflags-y += -I$(BTIF_SRC)/common/inc
+
+ccflags-y += -I$(src)/core/include
+ccflags-y += -I$(src)/connsys/connac_2_0
+
+ifeq ($(USE_DEVICE_NODE), y)
+ccflags-y += -DUSE_DEVICE_NODE=1
+else
+ccflags-y += -DUSE_DEVICE_NODE=0
+endif
+
+# ---------------------------------------------------
+# Objects List
+# ---------------------------------------------------
+MODULE_NAME := bt_drv
+obj-y += $(MODULE_NAME).o
+
+#PLAT_DIR  := plat/$(MTK_PLATFORM)
+
+CORE_OBJS := btmtk_main.o btmtk_dbg.o btmtk_irq.o
+
+ifeq ($(USE_DEVICE_NODE), y)
+CORE_OBJS += btmtk_char_dev.o btmtk_queue.o
+endif
+
+CHIP_OBJS := btmtk_mt66xx.o
+HIF_OBJS := btmtk_btif_main.o btmtk_fw_log.o
+
+#$(MODULE_NAME)-objs += bt_char_dev.o
+#ifneq ($(CONFIG_MTK_CONNSYS_DEDICATED_LOG_PATH),)
+#$(MODULE_NAME)-objs += fw_log_bt.o
+#endif
+
+$(MODULE_NAME)-objs  += $(CORE_OBJS)
+$(MODULE_NAME)-objs  += $(HIF_OBJS)
+$(MODULE_NAME)-objs  += $(CHIP_OBJS)