diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Android.mk b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Android.mk new file mode 100644 index 000000000000..240c5508a037 --- /dev/null +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Android.mk @@ -0,0 +1,20 @@ +DLKM_DIR := motorola/kernel/modules +LOCAL_PATH := $(call my-dir) + +ifeq ($(DLKM_INSTALL_TO_VENDOR_OUT),true) +SYNA_TCM_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/modules/ +else +SYNA_TCM_MODULE_PATH := $(KERNEL_MODULES_OUT) +endif + +include $(CLEAR_VARS) +ifneq ($(findstring synaptics_i2c.ko,$(BOARD_VENDOR_KERNEL_MODULES)),) + KERNEL_CFLAGS += USE_TOUCHSCREEN_MMI_I2C=y + LOCAL_MODULE := synaptics_i2c.ko +else + LOCAL_MODULE := synaptics_spi.ko +endif + LOCAL_MODULE_TAGS := optional + LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) + +include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Kbuild b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Kbuild new file mode 100644 index 000000000000..2e3eec5411bf --- /dev/null +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/Kbuild @@ -0,0 +1,10 @@ +# add -Wall to try to catch everything we can. +EXTRA_CFLAGS += -Wall +EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \ + -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/synaptics_tcm_mmi_v2 + +ifneq ($(filter m y,$(USE_TOUCHSCREEN_MMI_I2C)),) + obj-m += synaptics_i2c.o +else + obj-m += synaptics_spi.o +endif diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_i2c.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/synaptics_i2c.c similarity index 99% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_i2c.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/synaptics_i2c.c index 01e7b6ce2f82..6c6acfcedddb 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_i2c.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/synaptics_i2c.c @@ -36,7 +36,7 @@ #include #include -#include "synaptics_core.h" +#include "../synaptics_core/synaptics_core.h" #define XFER_ATTEMPTS 10 diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_spi.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/synaptics_spi.c similarity index 99% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_spi.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/synaptics_spi.c index 9a1b6a2f1253..17ba6dd094d8 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_spi.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_bus/synaptics_spi.c @@ -36,7 +36,7 @@ #include #include -#include "synaptics_core.h" +#include "../synaptics_core/synaptics_core.h" static unsigned char *buf; diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Android.mk b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Android.mk new file mode 100644 index 000000000000..35677cbe9f6f --- /dev/null +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Android.mk @@ -0,0 +1,28 @@ +DLKM_DIR := motorola/kernel/modules +LOCAL_PATH := $(call my-dir) + +ifeq ($(DRM_PANEL_NOTIFICATIONS),true) + KERNEL_CFLAGS += CONFIG_DRM_PANEL_NOTIFICATIONS=y +endif + +ifeq ($(DLKM_INSTALL_TO_VENDOR_OUT),true) +SYNA_TCM_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/modules/ +else +SYNA_TCM_MODULE_PATH := $(KERNEL_MODULES_OUT) +endif + +include $(CLEAR_VARS) +LOCAL_MODULE := synaptics_core_module.ko +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) +ifneq ($(findstring touchscreen_mmi.ko,$(BOARD_VENDOR_KERNEL_MODULES)),) + KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_MMI=y + LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/touchscreen_mmi.ko +endif +ifneq ($(findstring synaptics_i2c.ko,$(BOARD_VENDOR_KERNEL_MODULES)),) + LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/synaptics_i2c.ko +else + LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/synaptics_spi.ko +endif + +include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Kbuild b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Kbuild new file mode 100644 index 000000000000..1790fbab5643 --- /dev/null +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Kbuild @@ -0,0 +1,18 @@ +# add -Wall to try to catch everything we can. +EXTRA_CFLAGS += -Wall +EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \ + -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/synaptics_tcm_mmi_v2 + +obj-m += synaptics_core_module.o + +synaptics_core_module-objs := synaptics_core.o synaptics_touch.o +ifneq ($(filter m y, $(CONFIG_DRM_PANEL_NOTIFICATIONS)),) + EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_NOTIFICATIONS +endif +ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_MMI)),) + EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI + synaptics_core_module-objs += synaptics_ts_mmi.o + KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../touchscreen_mmi/Module.symvers +endif + +KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../synaptics_bus/Module.symvers diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/Makefile b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Makefile similarity index 100% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/Makefile rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/Makefile diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_core.c similarity index 100% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_core.c diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core.h b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_core.h similarity index 100% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core.h rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_core.h diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_tcm.h b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_tcm.h similarity index 100% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_tcm.h rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_tcm.h diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_touch.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_touch.c similarity index 100% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_touch.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_touch.c diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_ts_mmi.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_ts_mmi.c similarity index 100% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_ts_mmi.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_core/synaptics_ts_mmi.c diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/Android.mk b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Android.mk similarity index 71% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/Android.mk rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Android.mk index 87d7ff17091c..464b6972f79e 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/Android.mk +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Android.mk @@ -4,6 +4,9 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring touchscreen_mmi.ko,$(BOARD_VENDOR_KERNEL_MODULES)),) KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_MMI=y endif +ifeq ($(DRM_PANEL_NOTIFICATIONS),true) + KERNEL_CFLAGS += CONFIG_DRM_PANEL_NOTIFICATIONS=y +endif ifeq ($(DLKM_INSTALL_TO_VENDOR_OUT),true) SYNA_TCM_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/modules/ @@ -11,59 +14,45 @@ else SYNA_TCM_MODULE_PATH := $(KERNEL_MODULES_OUT) endif -include $(CLEAR_VARS) -LOCAL_MODULE := synaptics_spi.ko -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) -include $(DLKM_DIR)/AndroidKernelModule.mk - - -include $(CLEAR_VARS) -LOCAL_MODULE := synaptics_i2c.ko -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) -include $(DLKM_DIR)/AndroidKernelModule.mk - - -include $(CLEAR_VARS) -LOCAL_MODULE := synaptics_core_module.ko -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) -include $(DLKM_DIR)/AndroidKernelModule.mk - include $(CLEAR_VARS) LOCAL_MODULE := synaptics_device.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) +LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko include $(DLKM_DIR)/AndroidKernelModule.mk include $(CLEAR_VARS) LOCAL_MODULE := synaptics_diagnostics.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) +LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko include $(DLKM_DIR)/AndroidKernelModule.mk include $(CLEAR_VARS) LOCAL_MODULE := synaptics_recovery.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) +LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko include $(DLKM_DIR)/AndroidKernelModule.mk include $(CLEAR_VARS) LOCAL_MODULE := synaptics_reflash.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) +LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko include $(DLKM_DIR)/AndroidKernelModule.mk include $(CLEAR_VARS) LOCAL_MODULE := synaptics_testing.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) +LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko include $(DLKM_DIR)/AndroidKernelModule.mk include $(CLEAR_VARS) LOCAL_MODULE := synaptics_zeroflash.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(SYNA_TCM_MODULE_PATH) +LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/synaptics_core_module.ko include $(DLKM_DIR)/AndroidKernelModule.mk diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/Kbuild b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Kbuild similarity index 65% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/Kbuild rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Kbuild index 7bea1dc404e2..fef3b94fc612 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/Kbuild +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/Kbuild @@ -3,9 +3,6 @@ EXTRA_CFLAGS += -Wall EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \ -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/synaptics_tcm_mmi_v2 -obj-m += synaptics_spi.o -obj-m += synaptics_i2c.o -obj-m += synaptics_core_module.o obj-m += synaptics_device.o obj-m += synaptics_diagnostics.o obj-m += synaptics_recovery.o @@ -13,9 +10,10 @@ obj-m += synaptics_reflash.o obj-m += synaptics_testing.o obj-m += synaptics_zeroflash.o -synaptics_core_module-objs := synaptics_core.o synaptics_touch.o +ifneq ($(filter m y, $(CONFIG_DRM_PANEL_NOTIFICATIONS)),) + EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_NOTIFICATIONS +endif ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_MMI)),) EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI - synaptics_core_module-objs += synaptics_ts_mmi.o - KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../touchscreen_mmi/Module.symvers endif +KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../synaptics_core/Module.symvers diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_device.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_device.c similarity index 99% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_device.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_device.c index e1f011ae10ae..e28b381ab95b 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_device.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_device.c @@ -37,7 +37,7 @@ #include #include #include -#include "synaptics_core.h" +#include "../synaptics_core/synaptics_core.h" #define CHAR_DEVICE_NAME "tcm" diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_diagnostics.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_diagnostics.c similarity index 99% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_diagnostics.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_diagnostics.c index 3b3e6b036a55..160935e13d91 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_diagnostics.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_diagnostics.c @@ -34,7 +34,7 @@ * DOLLARS. */ -#include "synaptics_core.h" +#include "../synaptics_core/synaptics_core.h" #include #include diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_recovery.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_recovery.c similarity index 99% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_recovery.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_recovery.c index d9c83bedc29a..3cad33b37958 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_recovery.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_recovery.c @@ -34,7 +34,7 @@ * DOLLARS. */ -#include "synaptics_core.h" +#include "../synaptics_core/synaptics_core.h" #define SET_UP_RECOVERY_MODE true diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_reflash.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_reflash.c similarity index 99% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_reflash.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_reflash.c index ad2f6f5bbc18..78ecb8b1a460 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_reflash.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_reflash.c @@ -36,7 +36,7 @@ #include #include -#include "synaptics_core.h" +#include "../synaptics_core/synaptics_core.h" /* #define STARTUP_REFLASH */ diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_testing.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_testing.c similarity index 99% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_testing.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_testing.c index 0f9b58c57299..ab6653241555 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_testing.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_testing.c @@ -35,7 +35,7 @@ */ #include -#include "synaptics_core.h" +#include "../synaptics_core/synaptics_core.h" #include "synaptics_testing.h" #define SYSFS_DIR_NAME "testing" diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_testing.h b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_testing.h similarity index 100% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_testing.h rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_testing.h diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_zeroflash.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_zeroflash.c similarity index 99% rename from drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_zeroflash.c rename to drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_zeroflash.c index 15795a1cd2e6..32f0d08e7ccc 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_zeroflash.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_extmodules/synaptics_zeroflash.c @@ -37,7 +37,7 @@ #include #include #include -#include "synaptics_core.h" +#include "../synaptics_core/synaptics_core.h" #define ENABLE_SYS_ZEROFLASH true