--- v8
+++ v5
@@ -8,11 +8,6 @@
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
-
-(no changes since v6)
-
-Changes in v6:
-- Suspend/resume are no longer exported from the core.
Changes in v5:
- i2chid_subclass_data => i2chid_ops.
@@ -27,8 +22,8 @@
drivers/hid/i2c-hid/Kconfig | 19 +++-
drivers/hid/i2c-hid/Makefile | 1 +
- drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 116 ++++++++++++++++++++++++
- 3 files changed, 134 insertions(+), 2 deletions(-)
+ drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 120 ++++++++++++++++++++++++
+ 3 files changed, 138 insertions(+), 2 deletions(-)
create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-goodix.c
diff --git a/drivers/hid/i2c-hid/Kconfig b/drivers/hid/i2c-hid/Kconfig
@@ -74,10 +69,10 @@
+obj-$(CONFIG_I2C_HID_OF_GOODIX) += i2c-hid-of-goodix.o
diff --git a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c
new file mode 100644
-index 000000000000..7cc51c25c609
+index 000000000000..eada0363ef62
--- /dev/null
+++ b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Driver for Goodix touchscreens that use the i2c-hid protocol.
@@ -178,10 +173,14 @@
+};
+MODULE_DEVICE_TABLE(of, goodix_i2c_hid_of_match);
+
++static const struct dev_pm_ops goodix_i2c_hid_pm = {
++ SET_SYSTEM_SLEEP_PM_OPS(i2c_hid_core_suspend, i2c_hid_core_resume)
++};
++
+static struct i2c_driver goodix_i2c_hid_ts_driver = {
+ .driver = {
+ .name = "i2c_hid_of_goodix",
-+ .pm = &i2c_hid_core_pm,
++ .pm = &goodix_i2c_hid_pm,
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
+ .of_match_table = of_match_ptr(goodix_i2c_hid_of_match),
+ },
@@ -195,5 +194,5 @@
+MODULE_DESCRIPTION("Goodix i2c-hid touchscreen driver");
+MODULE_LICENSE("GPL v2");
--
-2.29.2.576.ga3fc446d84-goog
+2.29.2.222.g5d2a92d10f8-goog