asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "(CR) synaptics_mmi_class: banks cli bringup"

Browse source 
This reverts commit e27b5c3a28177c7b9756b3b62aca8378252557a3.

Mot-CRs-fixed: (CR)

Change-Id: I11010cf049ea29c0967df11a79a7410cd99c81d5
Reviewed-on: https://gerrit.mot.com/1881606
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Igor Kovalenko <igork@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Konstantin Makariev 2021-02-18 12:19:24 -06:00
parent c84d151c7a
commit 5c38a48921
4 changed files with 16 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/input/touchscreen/synaptics_mmi_class/Android.mk
View file

@ -8,8 +8,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := synaptics_mmi.ko
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/mmi_info.ko
LOCAL_ADDITIONAL_DEPENDENCIES += $(KERNEL_MODULES_OUT)/touchscreen_mmi.ko
include $(DLKM_DIR)/AndroidKernelModule.mk
include $(CLEAR_VARS)
@ -30,5 +28,4 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
endif

21
drivers/input/touchscreen/synaptics_mmi_class/Kbuild
View file

@ -1,28 +1,13 @@
# 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_mmi_class
ifneq ($(filter banks%, $(TARGET_PRODUCT)),)
EXTRA_CFLAGS += -DSOFTDEP_GPIO_PCAL6408
endif
EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include \
-I$(TOP)/motorola/kernel/modules/drivers/input/touchscreen/synaptics_mmi_class
ifneq ($(filter m y,$(CONFIG_INPUT_TOUCHSCREEN_MMI)),)
EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI
ifneq ($(filter m y, $(CONFIG_DRM_PANEL_NOTIFICATIONS)),)
EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_NOTIFICATIONS
endif
ifneq ($(filter m y, $(CONFIG_PANEL_NOTIFICATIONS)),)
EXTRA_CFLAGS += -DCONFIG_PANEL_NOTIFICATIONS
endif
EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI -DCONFIG_PANEL_NOTIFICATIONS
synaptics_mmi-objs = synaptics_dsx_i2c.o synaptics_mmi_class.o synaptics_dsx_instance.o
KBUILD_EXTRA_SYMBOLS += \
$(CURDIR)/$(KBUILD_EXTMOD)/../touchscreen_mmi/$(GKI_OBJ_MODULE_DIR)/Module.symvers \
$(CURDIR)/$(KBUILD_EXTMOD)/../../../mmi_info/$(GKI_OBJ_MODULE_DIR)/Module.symvers
obj-m += synaptics_mmi.o
obj-m += synaptics_dsx_fw_update.o
obj-m += synaptics_dsx_rmi_dev.o

20
drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.c
View file

@ -48,7 +48,6 @@
#endif
#endif
#include <linux/mmi_device.h>
#include "synaptics_dsx_i2c.h"
static struct workqueue_struct *det_workqueue;
@ -1314,7 +1313,7 @@ clip_area:
}
/* ASCII names order MUST match enum */
static const char *ascii_names[] = { "aod", "stats", "folio",
static const char const *ascii_names[] = { "aod", "stats", "folio",
"charger", "wakeup", "fps", "query", "runtime", "na"
};
@ -6343,6 +6342,13 @@ static int rmi_reboot(struct notifier_block *nb,
/* At this point, we're all good with clean-up works */
synaptics_dsx_set_state_safe(rmi4_data, STATE_INVALID);
#if defined(CONFIG_MMI_PANEL_NOTIFICATIONS)
mmi_panel_unregister_notifier(&rmi4_data->panel_nb);
#elif defined(CONFIG_DRM)
msm_drm_unregister_client(&rmi4_data->panel_nb);
#elif defined(CONFIG_FB)
fb_unregister_client(&rmi4_data->panel_nb);
#endif
if (rmi4_data->irq_enabled) {
rmi4_data->irq_enabled = false;
disable_irq(rmi4_data->irq);
@ -6517,6 +6523,7 @@ static int synaptics_rmi4_hw_init(struct synaptics_rmi4_data *rmi4_data)
}
}
rmi4_data->pm_qos_irq.irq = rmi4_data->irq;
synaptics_dsx_sensor_ready_state(rmi4_data, true);
rmi4_data->rmi_reboot.notifier_call = rmi_reboot;
@ -6633,11 +6640,6 @@ static int synaptics_rmi4_probe(struct i2c_client *client,
return -EIO;
}
if (client->dev.of_node && !mmi_device_is_available(client->dev.of_node)) {
dev_err(&client->dev, "%s: mmi: device not supported\n", __func__);
return -ENODEV;
}
rmi4_data = kzalloc(sizeof(*rmi4_data), GFP_KERNEL);
if (!rmi4_data) {
dev_err(&client->dev,
@ -7112,7 +7114,3 @@ MODULE_AUTHOR("Synaptics, Inc.");
MODULE_DESCRIPTION("Synaptics DSX I2C Touch Driver");
MODULE_LICENSE("GPL v2");
MODULE_VERSION(SYNAPTICS_DSX_DRIVER_VERSION);
#ifdef SOFTDEP_GPIO_PCAL6408
MODULE_SOFTDEP("pre: gpio-pcal6408");
#endif

7
drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.h
View file

@ -36,8 +36,8 @@
#include <linux/usb.h>
#include <linux/power_supply.h>
#endif
#if defined(CONFIG_PANEL_NOTIFICATIONS)
#include <linux/panel_notifier.h>
#if defined(CONFIG_MMI_PANEL_NOTIFICATIONS)
#include <linux/mmi_panel_notifier.h>
#elif defined(CONFIG_DRM)
#include <linux/msm_drm_notify.h>
#endif
@ -518,7 +518,7 @@ struct synaptics_rmi4_data {
struct regulator *vdd_quirk;
struct mutex rmi4_io_ctrl_mutex;
struct mutex state_mutex;
#if defined(CONFIG_PANEL_NOTIFICATIONS)
#if defined(CONFIG_MMI_PANEL_NOTIFICATIONS)
struct mmi_notifier panel_nb;
#elif defined(CONFIG_FB)
struct notifier_block panel_nb;
@ -594,6 +594,7 @@ struct synaptics_rmi4_data {
struct mutex rmi4_exp_init_mutex;
uint32_t pm_qos_latency;
struct pm_qos_request pm_qos_irq;
struct reporting_ctrl rctrl;
unsigned char tsb_buff_clean_flag;