A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

add mmi_relay notify interface by conditional

Browse source 
goodix fps driver is used by capacitive fps sensor as well, however 
mmi_relay is required by FOD module only,  so add the mmi_relay module
under conditional.

Change-Id: Ib93a2a7f9f8c8254cd67b7882336e9b7751e9863
Signed-off-by: Yan Zhang <zhangy26@motorola.com>
Reviewed-on: https://gerrit.mot.com/1808891
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Weilong Wu <wuwl10@motorola.com>
Reviewed-by: Lijun Chen <chenlj2@motorola.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Yan Zhang 2020-11-23 17:59:23 +08:00
commit 06f5b5afc1
3 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/input/misc/goodix_fod_mmi/Android.mk
View file

@ -5,7 +5,10 @@ include $(CLEAR_VARS)
LOCAL_MODULE := goodix_fod_mmi.ko
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/mmi_relay.ko
ifneq ($(findstring mmi_relay.ko,$(BOARD_VENDOR_KERNEL_MODULES)),)
KERNEL_CFLAGS += CONFIG_MMI_RELAY=y
LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/mmi_relay.ko
endif
KBUILD_OPTIONS_GKI += GKI_OBJ_MODULE_DIR=gki
include $(DLKM_DIR)/AndroidKernelModule.mk

4
drivers/input/misc/goodix_fod_mmi/Kbuild
View file

@ -2,7 +2,9 @@
EXTRA_CFLAGS += -Wall
EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \
ifneq ($(filter m y,$(CONFIG_MMI_RELAY)),)
EXTRA_CFLAGS += -DMMI_RELAY_MODULE
endif
goodix_fod_mmi-y += gf_spi.o netlink.o platform.o
obj-m += goodix_fod_mmi.o

26
drivers/input/misc/goodix_fod_mmi/gf_spi.c
View file

@ -41,7 +41,9 @@
#include <linux/fb.h>
#include <linux/pm_qos.h>
#include <linux/cpufreq.h>
#ifdef MMI_RELAY_MODULE
#include <linux/mmi_relay.h>
#endif
#include "gf_spi.h"
#if defined(USE_SPI_BUS)
@ -92,13 +94,13 @@ static struct gf_key_map maps[] = {
{ EV_KEY, GF_NAV_INPUT_HEAVY },
#endif
};
#ifdef MMI_RELAY_MODULE
struct FPS_data {
unsigned int enabled;
unsigned int state;
struct notifier_block relay_notif;
} *fpsData;
#endif
static void gf_enable_irq(struct gf_dev *gf_dev)
{
if (gf_dev->irq_enabled) {
@ -118,7 +120,7 @@ static void gf_disable_irq(struct gf_dev *gf_dev)
pr_warn("IRQ has been disabled.\n");
}
}
#ifdef MMI_RELAY_MODULE
static int fps_mmi_relay_cb(struct notifier_block *self,
unsigned long event, void *p)
{
@ -141,6 +143,7 @@ static int fps_mmi_relay_cb(struct notifier_block *self,
return 0;
}
static struct FPS_data *FPS_init(struct device *dev)
{
struct FPS_data *mdata = devm_kzalloc(dev,
@ -177,18 +180,21 @@ void FPS_notify(unsigned long stype, int state)
} else
pr_warn("%s: mdata->state==state", __func__);
}
#endif
static ssize_t dev_enable_set(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
int state = (*buf == '1') ? 1 : 0;
#ifdef MMI_RELAY_MODULE
FPS_notify(0xbeef, state);
#endif
dev_dbg(dev, "%s state = %d\n", __func__, state);
return count;
}
static DEVICE_ATTR(dev_enable, S_IWUSR | S_IWGRP, NULL, dev_enable_set);
static struct attribute *attributes[] = {
&dev_attr_dev_enable.attr,
NULL
@ -452,14 +458,14 @@ static long gf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0))
retval = !access_ok((void __user *)arg, _IOC_SIZE(cmd));
#else
retval = !access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd));
retval = !access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd));
#endif
}
else if (_IOC_DIR(cmd) & _IOC_WRITE){
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0))
retval = !access_ok((void __user *)arg, _IOC_SIZE(cmd));
#else
retval = !access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd));
retval = !access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd));
#endif
}
if (retval)
@ -573,7 +579,9 @@ static long gf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
retval = -EFAULT;
break;
}
#ifdef MMI_RELAY_MODULE
FPS_notify(0xbeef, (dev_enable == 0)? 0: 1);
#endif
pr_debug("%s device enable status %d\n", __func__, dev_enable);
break;
@ -850,10 +858,10 @@ static int gf_probe(struct platform_device *pdev)
gf_dev->irq_enabled = 1;
gf_disable_irq(gf_dev);
device_init_wakeup(dev, true);
#ifdef MMI_RELAY_MODULE
fpsData = FPS_init(dev);
#endif
status = sysfs_create_group(&dev->kobj, &attribute_group);
if (status) {
pr_err("failed to create sysfs group. %d\n", status);
goto err_sysfs;