Browse Source

touch: removing pt touch for Pineapple target

Change removes compilation of pt touch driver which is
not needed for Pineapple.

Change-Id: Ie79fad0dea645ab9332490eb2bb8549228ad13b4
Signed-off-by: Kirill Shpin <[email protected]>
Kirill Shpin 2 years ago
parent
commit
f69760205e
4 changed files with 98 additions and 80 deletions
  1. 34 32
      Android.mk
  2. 36 34
      Kbuild
  3. 14 7
      touch_driver_board.mk
  4. 14 7
      touch_driver_product.mk

+ 34 - 32
Android.mk

@@ -77,37 +77,39 @@ ifeq ($(TOUCH_DLKM_ENABLE),  true)
 	include $(DLKM_DIR)/Build_external_kernelmodule.mk
 	###########################################################
 
-	###########################################################
-	include $(CLEAR_VARS)
-	LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
-	LOCAL_MODULE              := pt_ts.ko
-	LOCAL_MODULE_KBUILD_NAME  := pt_ts.ko
-	LOCAL_MODULE_TAGS         := optional
-	#LOCAL_MODULE_DEBUG_ENABLE := true
-	LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-	include $(DLKM_DIR)/Build_external_kernelmodule.mk
-	###########################################################
-
-	###########################################################
-	include $(CLEAR_VARS)
-	LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
-	LOCAL_MODULE              := pt_i2c.ko
-	LOCAL_MODULE_KBUILD_NAME  := pt_i2c.ko
-	LOCAL_MODULE_TAGS         := optional
-	#LOCAL_MODULE_DEBUG_ENABLE := true
-	LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-	include $(DLKM_DIR)/Build_external_kernelmodule.mk
-	###########################################################
-
-	###########################################################
-	include $(CLEAR_VARS)
-	LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
-	LOCAL_MODULE              := pt_device_access.ko
-	LOCAL_MODULE_KBUILD_NAME  := pt_device_access.ko
-	LOCAL_MODULE_TAGS         := optional
-	#LOCAL_MODULE_DEBUG_ENABLE := true
-	LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-	include $(DLKM_DIR)/Build_external_kernelmodule.mk
-	###########################################################
+	ifneq ($(TARGET_BOARD_PLATFORM), pineapple)
+		###########################################################
+		include $(CLEAR_VARS)
+		LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
+		LOCAL_MODULE              := pt_ts.ko
+		LOCAL_MODULE_KBUILD_NAME  := pt_ts.ko
+		LOCAL_MODULE_TAGS         := optional
+		#LOCAL_MODULE_DEBUG_ENABLE := true
+		LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+		include $(DLKM_DIR)/Build_external_kernelmodule.mk
+		###########################################################
+
+		###########################################################
+		include $(CLEAR_VARS)
+		LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
+		LOCAL_MODULE              := pt_i2c.ko
+		LOCAL_MODULE_KBUILD_NAME  := pt_i2c.ko
+		LOCAL_MODULE_TAGS         := optional
+		#LOCAL_MODULE_DEBUG_ENABLE := true
+		LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+		include $(DLKM_DIR)/Build_external_kernelmodule.mk
+		###########################################################
+
+		###########################################################
+		include $(CLEAR_VARS)
+		LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
+		LOCAL_MODULE              := pt_device_access.ko
+		LOCAL_MODULE_KBUILD_NAME  := pt_device_access.ko
+		LOCAL_MODULE_TAGS         := optional
+		#LOCAL_MODULE_DEBUG_ENABLE := true
+		LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+		include $(DLKM_DIR)/Build_external_kernelmodule.mk
+		###########################################################
+	endif # pineapple
 	endif # DLKM check
 endif

+ 36 - 34
Kbuild

@@ -146,39 +146,41 @@ ifeq ($(CONFIG_TOUCHSCREEN_SYNAPTICS_TCM), y)
 
 endif
 
-ifeq ($(CONFIG_TOUCHSCREEN_PARADE), y)
-	LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_regs.h
-	LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_core.h
-	LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_platform.h
-
-	pt_ts-y := \
-		./pt/pt_core.o \
-		./pt/pt_mt_common.o \
-		./pt/pt_platform.o \
-		./pt/pt_devtree.o \
-		./pt/pt_btn.o \
-		./pt/pt_mtb.o \
-		./pt/pt_proximity.o
-
-	obj-$(CONFIG_MSM_TOUCH) += pt_ts.o
-endif
-
-ifeq ($(CONFIG_TOUCHSCREEN_PARADE_I2C), y)
-	LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_regs.h
-
-	pt_i2c-y := \
-		./pt/pt_i2c.o
-
-	obj-$(CONFIG_MSM_TOUCH) += pt_i2c.o
-endif
-
-ifeq ($(CONFIG_TOUCHSCREEN_PARADE_DEVICE_ACCESS), y)
-	LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_regs.h
-
-	pt_device_access-y := \
-		./pt/pt_device_access.o
-
-	obj-$(CONFIG_MSM_TOUCH) += pt_device_access.o
-endif
+ifneq ($(CONFIG_ARCH_PINEAPPLE), y)
+	ifeq ($(CONFIG_TOUCHSCREEN_PARADE), y)
+		LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_regs.h
+		LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_core.h
+		LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_platform.h
+
+		pt_ts-y := \
+			./pt/pt_core.o \
+			./pt/pt_mt_common.o \
+			./pt/pt_platform.o \
+			./pt/pt_devtree.o \
+			./pt/pt_btn.o \
+			./pt/pt_mtb.o \
+			./pt/pt_proximity.o
+
+		obj-$(CONFIG_MSM_TOUCH) += pt_ts.o
+	endif
+
+	ifeq ($(CONFIG_TOUCHSCREEN_PARADE_I2C), y)
+		LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_regs.h
+
+		pt_i2c-y := \
+			./pt/pt_i2c.o
+
+		obj-$(CONFIG_MSM_TOUCH) += pt_i2c.o
+	endif
+
+	ifeq ($(CONFIG_TOUCHSCREEN_PARADE_DEVICE_ACCESS), y)
+		LINUX_INC += -include $(TOUCH_ROOT)/pt/pt_regs.h
+
+		pt_device_access-y := \
+			./pt/pt_device_access.o
+
+		obj-$(CONFIG_MSM_TOUCH) += pt_device_access.o
+	endif
+endif # pineapple
 
 CDEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"

+ 14 - 7
touch_driver_board.mk

@@ -8,13 +8,20 @@ endif
 ifeq ($(TOUCH_DLKM_ENABLE),  true)
 	ifneq ($(TARGET_BOARD_AUTO),true)
 		ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
-			BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
-				$(KERNEL_MODULES_OUT)/goodix_ts.ko \
-				$(KERNEL_MODULES_OUT)/atmel_mxt_ts.ko \
-				$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
-				$(KERNEL_MODULES_OUT)/pt_ts.ko \
-				$(KERNEL_MODULES_OUT)/pt_i2c.ko \
-				$(KERNEL_MODULES_OUT)/pt_device_access.ko
+			ifeq ($(TARGET_BOARD_PLATFORM), pineapple)
+				BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
+					$(KERNEL_MODULES_OUT)/goodix_ts.ko \
+					$(KERNEL_MODULES_OUT)/atmel_mxt_ts.ko \
+					$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko
+			else # pineapple
+				BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
+					$(KERNEL_MODULES_OUT)/goodix_ts.ko \
+					$(KERNEL_MODULES_OUT)/atmel_mxt_ts.ko \
+					$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
+					$(KERNEL_MODULES_OUT)/pt_ts.ko \
+					$(KERNEL_MODULES_OUT)/pt_i2c.ko \
+					$(KERNEL_MODULES_OUT)/pt_device_access.ko
+			endif # pineapple
 		endif
 	endif
 endif

+ 14 - 7
touch_driver_product.mk

@@ -6,11 +6,18 @@ ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
 endif
 
 ifeq ($(TOUCH_DLKM_ENABLE),  true)
-	PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
-		$(KERNEL_MODULES_OUT)/goodix_ts.ko \
-		$(KERNEL_MODULES_OUT)/atmel_mxt_ts.ko \
-		$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
-		$(KERNEL_MODULES_OUT)/pt_ts.ko \
-		$(KERNEL_MODULES_OUT)/pt_i2c.ko \
-		$(KERNEL_MODULES_OUT)/pt_device_access.ko
+	ifeq ($(TARGET_BOARD_PLATFORM), pineapple)
+		PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
+			$(KERNEL_MODULES_OUT)/goodix_ts.ko \
+			$(KERNEL_MODULES_OUT)/atmel_mxt_ts.ko \
+			$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko
+	else # pineapple
+		PRODUCT_PACKAGES += $(KERNEL_MODULES_OUT)/nt36xxx-i2c.ko \
+			$(KERNEL_MODULES_OUT)/goodix_ts.ko \
+			$(KERNEL_MODULES_OUT)/atmel_mxt_ts.ko \
+			$(KERNEL_MODULES_OUT)/synaptics_tcm_ts.ko \
+			$(KERNEL_MODULES_OUT)/pt_ts.ko \
+			$(KERNEL_MODULES_OUT)/pt_i2c.ko \
+			$(KERNEL_MODULES_OUT)/pt_device_access.ko
+	endif # pineapple
 endif