Merge "touch: remove raydium touch driver for Pineapple target"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
f67743ba90
22
Android.mk
22
Android.mk
@@ -66,17 +66,6 @@ ifeq ($(TOUCH_DLKM_ENABLE), true)
|
|||||||
include $(DLKM_DIR)/Build_external_kernelmodule.mk
|
include $(DLKM_DIR)/Build_external_kernelmodule.mk
|
||||||
###########################################################
|
###########################################################
|
||||||
|
|
||||||
###########################################################
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
|
|
||||||
LOCAL_MODULE := raydium_ts.ko
|
|
||||||
LOCAL_MODULE_KBUILD_NAME := raydium_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)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
|
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
|
||||||
@@ -121,6 +110,17 @@ ifeq ($(TOUCH_DLKM_ENABLE), true)
|
|||||||
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
|
||||||
include $(DLKM_DIR)/Build_external_kernelmodule.mk
|
include $(DLKM_DIR)/Build_external_kernelmodule.mk
|
||||||
###########################################################
|
###########################################################
|
||||||
|
|
||||||
|
###########################################################
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
|
||||||
|
LOCAL_MODULE := raydium_ts.ko
|
||||||
|
LOCAL_MODULE_KBUILD_NAME := raydium_ts.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 # pineapple
|
||||||
endif # DLKM check
|
endif # DLKM check
|
||||||
endif
|
endif
|
||||||
|
54
Kbuild
54
Kbuild
@@ -136,33 +136,6 @@ ifeq ($(CONFIG_TOUCHSCREEN_DUMMY), y)
|
|||||||
obj-$(CONFIG_MSM_TOUCH) += dummy_ts.o
|
obj-$(CONFIG_MSM_TOUCH) += dummy_ts.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_TOUCHSCREEN_RM_TS), y)
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/Config.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/drv_interface.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/rad_fw_image_30.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/raydium_driver.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/raydium_selftest.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/tpselftest_30.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/f303_ic_control.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/f303_ic_reg.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/f303_ic_test.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/ic_drv_global.h
|
|
||||||
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/ic_drv_interface.h
|
|
||||||
|
|
||||||
raydium_ts-y := \
|
|
||||||
./raydium/drv_interface.o \
|
|
||||||
./raydium/raydium_driver.o \
|
|
||||||
./raydium/raydium_fw_update.o \
|
|
||||||
./raydium/raydium_selftest.o \
|
|
||||||
./raydium/raydium_sysfs.o \
|
|
||||||
./raydium/chip_raydium/f303_ic_control.o \
|
|
||||||
./raydium/chip_raydium/f303_ic_test.o \
|
|
||||||
./raydium/chip_raydium/ic_drv_global.o \
|
|
||||||
./raydium/chip_raydium/ic_drv_interface.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_MSM_TOUCH) += raydium_ts.o
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_TOUCHSCREEN_SYNAPTICS_TCM), y)
|
ifeq ($(CONFIG_TOUCHSCREEN_SYNAPTICS_TCM), y)
|
||||||
synaptics_tcm_ts-y := \
|
synaptics_tcm_ts-y := \
|
||||||
./synaptics_tcm/synaptics_tcm_core.o \
|
./synaptics_tcm/synaptics_tcm_core.o \
|
||||||
@@ -208,6 +181,33 @@ ifneq ($(CONFIG_ARCH_PINEAPPLE), y)
|
|||||||
|
|
||||||
obj-$(CONFIG_MSM_TOUCH) += pt_device_access.o
|
obj-$(CONFIG_MSM_TOUCH) += pt_device_access.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_TOUCHSCREEN_RM_TS), y)
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/Config.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/drv_interface.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/rad_fw_image_30.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/raydium_driver.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/raydium_selftest.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/tpselftest_30.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/f303_ic_control.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/f303_ic_reg.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/f303_ic_test.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/ic_drv_global.h
|
||||||
|
LINUX_INC += -include $(TOUCH_ROOT)/raydium/chip_raydium/ic_drv_interface.h
|
||||||
|
|
||||||
|
raydium_ts-y := \
|
||||||
|
./raydium/drv_interface.o \
|
||||||
|
./raydium/raydium_driver.o \
|
||||||
|
./raydium/raydium_fw_update.o \
|
||||||
|
./raydium/raydium_selftest.o \
|
||||||
|
./raydium/raydium_sysfs.o \
|
||||||
|
./raydium/chip_raydium/f303_ic_control.o \
|
||||||
|
./raydium/chip_raydium/f303_ic_test.o \
|
||||||
|
./raydium/chip_raydium/ic_drv_global.o \
|
||||||
|
./raydium/chip_raydium/ic_drv_interface.o
|
||||||
|
|
||||||
|
obj-$(CONFIG_MSM_TOUCH) += raydium_ts.o
|
||||||
|
endif
|
||||||
endif # pineapple
|
endif # pineapple
|
||||||
|
|
||||||
CDEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"
|
CDEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"
|
||||||
|
Reference in New Issue
Block a user