diff --git a/linux-5.10/rk3568_patch/hdf.patch b/linux-5.10/rk3568_patch/hdf.patch index 1651f9d3b6c965904047dd9e8e2de0e4510d6ce9..987bb4b9fb2b6fb4f3bfba5da2553e13a80ea838 100644 --- a/linux-5.10/rk3568_patch/hdf.patch +++ b/linux-5.10/rk3568_patch/hdf.patch @@ -299,88 +299,7 @@ index 580d37834..fb945f4ce 100644 if (input_register_device(hidinput->input)) goto out_unwind; hidinput->registered = true; -diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile -index a48e5f2d8..90d25f224 100644 ---- a/drivers/input/misc/Makefile -+++ b/drivers/input/misc/Makefile -@@ -85,3 +85,17 @@ obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o - obj-$(CONFIG_INPUT_YEALINK) += yealink.o - obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR) += ideapad_slidebar.o - -+ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/input/driver \ -+ -I$(srctree)/drivers/hdf/framework/model/input/driver/input_bus_ops \ -+ -I$(srctree)/drivers/hdf/framework/include/core \ -+ -I$(srctree)/drivers/hdf/framework/core/common/include/host \ -+ -I$(srctree)/drivers/hdf/framework/include/utils \ -+ -I$(srctree)/drivers/hdf/framework/include/osal \ -+ -I$(srctree)/drivers/hdf/framework/include/platform \ -+ -I$(srctree)/drivers/hdf/framework/include/config \ -+ -I$(srctree)/drivers/hdf/framework/core/host/include \ -+ -I$(srctree)/drivers/hdf/framework/core/shared/include \ -+ -I$(srctree)/drivers/hdf/framework/utils/include \ -+ -I$(srctree)/drivers/hdf/khdf/osal/include -+ccflags-y +=-I$(srctree)/bounds_checking_function/include \ -+ -I$(srctree)/drivers/hdf/evdev -diff --git a/drivers/input/misc/rk805-pwrkey.c b/drivers/input/misc/rk805-pwrkey.c -index 3fb64dbda..394cd5912 100644 ---- a/drivers/input/misc/rk805-pwrkey.c -+++ b/drivers/input/misc/rk805-pwrkey.c -@@ -14,6 +14,9 @@ - #include - #include - #include -+#include "hdf_hid_adapter.h" -+ -+InputDevice *HidinputDev=NULL; - - static irqreturn_t pwrkey_fall_irq(int irq, void *_pwr) - { -@@ -22,6 +25,8 @@ static irqreturn_t pwrkey_fall_irq(int irq, void *_pwr) - input_report_key(pwr, KEY_POWER, 1); - input_sync(pwr); - -+ HidReportEvent(HidinputDev, EV_KEY, KEY_POWER, 1); -+ HidReportEvent(HidinputDev, EV_SYN, SYN_REPORT, 0); - return IRQ_HANDLED; - } - -@@ -32,9 +37,24 @@ static irqreturn_t pwrkey_rise_irq(int irq, void *_pwr) - input_report_key(pwr, KEY_POWER, 0); - input_sync(pwr); - -+ HidReportEvent(HidinputDev, EV_KEY, KEY_POWER, 0); -+ HidReportEvent(HidinputDev, EV_SYN, SYN_REPORT, 0); - return IRQ_HANDLED; - } - -+static InputDevice* HidRegisterHdfPowerKeyDev(void) -+{ -+ InputDevice* inputDev = NULL; -+ HidInfo Hid_keyInfo; -+ -+ Hid_keyInfo.devType = HID_TYPE_KEY; -+ Hid_keyInfo.eventType[0] = SET_BIT(EV_KEY); -+ Hid_keyInfo.keyCode[3] = SET_BIT(KEY_POWER); -+ Hid_keyInfo.devName = "hid-powerkey"; -+ inputDev = HidRegisterHdfInputDev(&Hid_keyInfo); -+ return inputDev; -+} -+ - static int rk805_pwrkey_probe(struct platform_device *pdev) - { - struct input_dev *pwr; -@@ -87,6 +107,11 @@ static int rk805_pwrkey_probe(struct platform_device *pdev) - platform_set_drvdata(pdev, pwr); - device_init_wakeup(&pdev->dev, true); - -+ HidinputDev = HidRegisterHdfPowerKeyDev(); -+ if (NULL == HidinputDev) { -+ pr_err("HidRegisterHdfInputDev error\n"); -+ return -EINVAL; -+ } - return 0; - } - + diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 505c562a5..67d451beb 100644 --- a/drivers/input/mousedev.c