HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p
Subsystems (3)
v9 cover HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p
The goal of this series is to support the Goodix GT7375P touchscreen. This touchscreen is special because it has power sequencing requirements that necessitate driving a reset GPIO.
To do this, we totally rejigger the way i2c-hid is organized so that it's easier to jam the Goodix support in there.
This series was:
- Tested on a device that uses normal i2c-hid.
- Tested on a device that has a Goodix i2c-hid device.
- Tested on an ACPI device, but an earlier version of the series.
I believe the plan is for Benjamin to land the whole series. Will said this about the arm64 defconfig change (and provided his Ack):
Quoted 6 lines
...there are a few things I really care about
in defconfig (e.g. things like page size!), generally speaking we don't need to Ack everything that changes in there.That said, might be worth checking whether arm-soc have any defconfig changes queued in -next so you don't end up with conflicts.
Changes in v9:
- 120 ms delay => 180 ms delay
- Local variable in ACPI code "ihid_of" => "ihid_acpi".
- Squash Benjamin's change for ACPI power on.
Changes in v8:
- Mark suspend/resume as static as per patches robot.
Changes in v7:
- Rebase atop commit afdd34c5fa40 ("HID: i2c-hid: show the error ...")
Changes in v6:
- ACPI probe function should have been "static"
- Don't export suspend/resume, just export dev_pm_ops from core.
- Fixed crash in ACPI module (missing init of "client")
- No need for regulator include in the core.
- Removed i2c_device_id table from ACPI module.
- Suspend/resume are no longer exported from the core.
Changes in v5:
- Add shutdown_tail op and use it in ACPI.
- Added mention of i2c-hid in the yaml itself as per Rob.
- Adjusted subject as per Rob.
- i2chid_subclass_data => i2chid_ops.
- power_up_device => power_up (same with power_down).
- subclass => ops.
Changes in v4:
- ("arm64: defconfig: Update config names for i2c-hid rejigger") new for v4.
- Fully rejigger so ACPI and OF are full subclasses.
- Totally redid based on the new subclass system.
Changes in v3:
- Fixed compatible in example.
- Removed Benjamin as a maintainer.
- Rework to use subclassing.
- Updated description.
Changes in v2:
- ("dt-bindings: HID: i2c-hid: Introduce bindings for the Goodix GT7375P") new in v2.
- Get timings based on the compatible string.
- Use a separate compatible string for this new touchscreen.
Douglas Anderson (4):
HID: i2c-hid: Reorganize so ACPI and OF are separate modules
arm64: defconfig: Update config names for i2c-hid rejigger
dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix
GT7375P
HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core
.../bindings/input/goodix,gt7375p.yaml | 65 +++++ arch/arm64/configs/defconfig | 3 +- drivers/hid/Makefile | 2 +- drivers/hid/i2c-hid/Kconfig | 47 +++- drivers/hid/i2c-hid/Makefile | 6 +- drivers/hid/i2c-hid/i2c-hid-acpi.c | 143 ++++++++++ drivers/hid/i2c-hid/i2c-hid-core.c | 252 +++--------------- drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 116 ++++++++ drivers/hid/i2c-hid/i2c-hid-of.c | 143 ++++++++++ drivers/hid/i2c-hid/i2c-hid.h | 22 ++ include/linux/platform_data/i2c-hid.h | 41 --- 11 files changed, 578 insertions(+), 262 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7375p.yaml create mode 100644 drivers/hid/i2c-hid/i2c-hid-acpi.c create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-goodix.c create mode 100644 drivers/hid/i2c-hid/i2c-hid-of.c delete mode 100644 include/linux/platform_data/i2c-hid.h
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog
PATCH v9 1/4 HID: i2c-hid: Reorganize so ACPI and OF are separate modules
This patch rejiggers the i2c-hid code so that the OF (Open Firmware aka Device Tree) and ACPI support is separated out a bit. The OF and ACPI drivers are now separate modules that wrap the core module.
Essentially, what we're doing here:
* Make "power up" and "power down" a function that can be (optionally) implemented by a given user of the i2c-hid core.
* The OF and ACPI modules are drivers on their own, so they implement probe / remove / suspend / resume / shutdown. The core code provides implementations that OF and ACPI can call into.
We'll organize this so that we now have 3 modules: the old i2c-hid module becomes the "core" module and two new modules will depend on it, handling probing the specific device.
As part of this work, we'll remove the i2c-hid "platform data" concept since it's not needed.
---
Changes in v9:
- Local variable in ACPI code "ihid_of" => "ihid_acpi".
- Squash Benjamin's change for ACPI power on.
Changes in v8:
- Mark suspend/resume as static as per patches robot.
Changes in v7:
- Rebase atop commit afdd34c5fa40 ("HID: i2c-hid: show the error ...")
Changes in v6:
- ACPI probe function should have been "static"
- Don't export suspend/resume, just export dev_pm_ops from core.
- Fixed crash in ACPI module (missing init of "client")
- No need for regulator include in the core.
- Removed i2c_device_id table from ACPI module.
Changes in v5:
- Add shutdown_tail op and use it in ACPI.
- i2chid_subclass_data => i2chid_ops.
- power_up_device => power_up (same with power_down).
- subclass => ops.
Changes in v4:
- Fully rejigger so ACPI and OF are full subclasses.
Changes in v3:
- Rework to use subclassing.
Changes in v2:
- Get timings based on the compatible string.
- Use a separate compatible string for this new touchscreen.
drivers/hid/Makefile | 2 +- drivers/hid/i2c-hid/Kconfig | 32 +++- drivers/hid/i2c-hid/Makefile | 5 +- drivers/hid/i2c-hid/i2c-hid-acpi.c | 143 +++++++++++++++ drivers/hid/i2c-hid/i2c-hid-core.c | 252 ++++---------------------- drivers/hid/i2c-hid/i2c-hid-of.c | 143 +++++++++++++++ drivers/hid/i2c-hid/i2c-hid.h | 22 +++ include/linux/platform_data/i2c-hid.h | 41 ----- 8 files changed, 379 insertions(+), 261 deletions(-) create mode 100644 drivers/hid/i2c-hid/i2c-hid-acpi.c create mode 100644 drivers/hid/i2c-hid/i2c-hid-of.c delete mode 100644 include/linux/platform_data/i2c-hid.h
drivers/hid/Makefile +1 -1
@@ -138,7 +138,7 @@ obj-$(CONFIG_USB_HID) += usbhid/ obj-$(CONFIG_USB_MOUSE) += usbhid/ obj-$(CONFIG_USB_KBD) += usbhid/ -obj-$(CONFIG_I2C_HID) += i2c-hid/ +obj-$(CONFIG_I2C_HID_CORE) += i2c-hid/ obj-$(CONFIG_INTEL_ISH_HID) += intel-ish-hid/ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/
drivers/hid/i2c-hid/Kconfig +27 -5
@@ -2,18 +2,40 @@ menu "I2C HID support" depends on I2C -config I2C_HID - tristate "HID over I2C transport layer" +config I2C_HID_ACPI + tristate "HID over I2C transport layer ACPI driver" default n - depends on I2C && INPUT - select HID + depends on I2C && INPUT && ACPI + help + Say Y here if you use a keyboard, a touchpad, a touchscreen, or any + other HID based devices which is connected to your computer via I2C. + This driver supports ACPI-based systems. + + If unsure, say N. + + This support is also available as a module. If so, the module + will be called i2c-hid-acpi. It will also build/depend on the + module i2c-hid. + +config I2C_HID_OF + tristate "HID over I2C transport layer Open Firmware driver" + default n + depends on I2C && INPUT && OF help Say Y here if you use a keyboard, a touchpad, a touchscreen, or any other HID based devices which is connected to your computer via I2C. + This driver supports Open Firmware (Device Tree)-based systems. If unsure, say N. This support is also available as a module. If so, the module - will be called i2c-hid. + will be called i2c-hid-of. It will also build/depend on the + module i2c-hid. endmenu + +config I2C_HID_CORE + tristate + default y if I2C_HID_ACPI=y || I2C_HID_OF=y + default m if I2C_HID_ACPI=m || I2C_HID_OF=m + select HID
drivers/hid/i2c-hid/Makefile +4 -1
@@ -3,7 +3,10 @@ # Makefile for the I2C input drivers # -obj-$(CONFIG_I2C_HID) += i2c-hid.o +obj-$(CONFIG_I2C_HID_CORE) += i2c-hid.o i2c-hid-objs = i2c-hid-core.o i2c-hid-$(CONFIG_DMI) += i2c-hid-dmi-quirks.o + +obj-$(CONFIG_I2C_HID_ACPI) += i2c-hid-acpi.o +obj-$(CONFIG_I2C_HID_OF) += i2c-hid-of.o
drivers/hid/i2c-hid/i2c-hid-acpi.c new file +143 -0
143 lines not on this page · raw message
drivers/hid/i2c-hid/i2c-hid-core.c +39 -213
377 lines not on this page · raw message
drivers/hid/i2c-hid/i2c-hid-of.c new file +143 -0
143 lines not on this page · raw message
drivers/hid/i2c-hid/i2c-hid.h +22 -0
@@ -3,6 +3,7 @@#ifndef I2C_HID_H #define I2C_HID_H +#include <linux/i2c.h> #ifdef CONFIG_DMI struct i2c_hid_desc *i2c_hid_get_dmi_i2c_hid_desc_override (uint8_t *i2c_name);
@@ -17,4 +18,25 @@ static inline char *i2c_hid_get_dmi_hid_report_desc_override(uint8_t *i2c_name, {return NULL ; }#endif +/** +* struct i2chid_ops - Ops provided to the core. +* +* @power_up: do sequencing to power up the device. +* @power_down: do sequencing to power down the device. +* @shutdown_tail: called at the end of shutdown. +*/ +struct i2chid_ops { +int (*power_up)(struct i2chid_ops *ops); +void (*power_down)(struct i2chid_ops *ops); +void (*shutdown_tail)(struct i2chid_ops *ops); +}; + +int i2c_hid_core_probe (struct i2c_client *client,struct i2chid_ops *ops, +u16 hid_descriptor_address); +int i2c_hid_core_remove (struct i2c_client *client); + +void i2c_hid_core_shutdown (struct i2c_client *client); + +extern const struct dev_pm_ops i2c_hid_core_pm; +#endif
include/linux/platform_data/i2c-hid.h deleted +0 -41
41 lines not on this page · raw message
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog
PATCH v9 2/4 arm64: defconfig: Update config names for i2c-hid rejigger
In reply to Douglas AndersonThe i2c-hid driver has been split in two. Let's enable both halves.
---
(no changes since v4)
Changes in v4:
- ("arm64: defconfig: Update config names for i2c-hid rejigger") new for v4.
arch/arm64/configs/defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/configs/defconfig +2 -1
@@ -749,7 +749,8 @@ CONFIG_SND_SOC_WM8904=m CONFIG_SND_SOC_WSA881X=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m -CONFIG_I2C_HID=m +CONFIG_I2C_HID_ACPI=m +CONFIG_I2C_HID_OF=m CONFIG_USB_CONN_GPIO=m CONFIG_USB=y CONFIG_USB_OTG=y
Signature · 7 lines
2.30.0.284.gd98b1dd5eaa7-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v9 3/4 dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix GT7375P
In reply to Douglas AndersonThis adds new bindings for the Goodix GT7375P touchscreen. While this touchscreen's communications are based on the generic "i2c-over-hid" protocol, it needs special power sequencing and thus gets its own compatible and bindings.
---
(no changes since v5)
Changes in v5:
- Added mention of i2c-hid in the yaml itself as per Rob.
- Adjusted subject as per Rob.
Changes in v3:
- Fixed compatible in example.
- Removed Benjamin as a maintainer.
- Updated description.
Changes in v2:
- ("dt-bindings: HID: i2c-hid: Introduce bindings for the Goodix GT7375P") new in v2.
.../bindings/input/goodix,gt7375p.yaml | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7375p.yaml
Documentation/devicetree/bindings/input/goodix,gt7375p.yaml new file +65 -0
@@ -0,0 +1,65 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/goodix,gt7375p.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Goodix GT7375P touchscreen + +maintainers: + - Douglas Anderson <[email protected]> + +description: + Supports the Goodix GT7375P touchscreen. + This touchscreen uses the i2c-hid protocol but has some non-standard + power sequencing required. + +properties: + compatible: + items: + - const: goodix,gt7375p + + reg: + enum: + - 0x5d + - 0x14 + + interrupts: + maxItems: 1 + + reset-gpios: + true + + vdd-supply: + description: The 3.3V supply to the touchscreen. + +required: + - compatible + - reg + - interrupts + - reset-gpios + - vdd-supply + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,rpmh.h> + #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/interrupt-controller/irq.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + ap_ts: touchscreen@5d { + compatible = "goodix,gt7375p"; + reg = <0x5d>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + + reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>; + vdd-supply = <&pp3300_ts>; + }; + };
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog
PATCH v9 4/4 HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core
In reply to Douglas AndersonGoodix i2c-hid touchscreens are mostly i2c-hid compliant but have some special power sequencing requirements, including the need to drive a reset line during the sequencing.
Let's use the new rejiggering of i2c-hid to support this with a thin wrapper driver to support the first Goodix i2c-hid touchscreen:
GT7375P
---
Changes in v9:
- 120 ms delay => 180 ms delay
Changes in v6:
- Suspend/resume are no longer exported from the core.
Changes in v5:
- i2chid_subclass_data => i2chid_ops.
- power_up_device => power_up (same with power_down).
- subclass => ops.
Changes in v4:
- Totally redid based on the new subclass system.
Changes in v3:
- Rework to use subclassing.
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(-) create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-goodix.c
drivers/hid/i2c-hid/Kconfig +17 -2
@@ -32,10 +32,25 @@ config I2C_HID_OF will be called i2c-hid-of. It will also build/depend on the module i2c-hid. +config I2C_HID_OF_GOODIX + tristate "Driver for Goodix hid-i2c based devices on OF systems" + default n + depends on I2C && INPUT && OF + help + Say Y here if you want support for Goodix i2c devices that use + the i2c-hid protocol on Open Firmware (Device Tree)-based + systems. + + If unsure, say N. + + This support is also available as a module. If so, the module + will be called i2c-hid-of-goodix. It will also build/depend on + the module i2c-hid. + endmenu config I2C_HID_CORE tristate - default y if I2C_HID_ACPI=y || I2C_HID_OF=y - default m if I2C_HID_ACPI=m || I2C_HID_OF=m + default y if I2C_HID_ACPI=y || I2C_HID_OF=y || I2C_HID_OF_GOODIX=y + default m if I2C_HID_ACPI=m || I2C_HID_OF=m || I2C_HID_OF_GOODIX=m select HID
drivers/hid/i2c-hid/Makefile +1 -0
@@ -10,3 +10,4 @@ i2c-hid-$(CONFIG_DMI) += i2c-hid-dmi-quirks.o obj-$(CONFIG_I2C_HID_ACPI) += i2c-hid-acpi.o obj-$(CONFIG_I2C_HID_OF) += i2c-hid-of.o +obj-$(CONFIG_I2C_HID_OF_GOODIX) += i2c-hid-of-goodix.o
drivers/hid/i2c-hid/i2c-hid-of-goodix.c new file +116 -0
116 lines not on this page · raw message
Signature · 1 line
2.30.0.284.gd98b1dd5eaa7-goog
Quoted 82 lines · Douglas Anderson
The goal of this series is to support the Goodix GT7375P touchscreen. This touchscreen is special because it has power sequencing requirements that necessitate driving a reset GPIO.
To do this, we totally rejigger the way i2c-hid is organized so that it's easier to jam the Goodix support in there.
This series was:
- Tested on a device that uses normal i2c-hid.
- Tested on a device that has a Goodix i2c-hid device.
- Tested on an ACPI device, but an earlier version of the series.I believe the plan is for Benjamin to land the whole series. Will said this about the arm64 defconfig change (and provided his Ack):
Quoted 6 lines
...there are a few things I really care about
in defconfig (e.g. things like page size!), generally speaking we don't need to Ack everything that changes in there.That said, might be worth checking whether arm-soc have any defconfig changes queued in -next so you don't end up with conflicts.
Changes in v9:
- 120 ms delay => 180 ms delay
- Local variable in ACPI code "ihid_of" => "ihid_acpi".
- Squash Benjamin's change for ACPI power on.Changes in v8:
- Mark suspend/resume as static as per patches robot.Changes in v7:
- Rebase atop commitafdd34c5fa40("HID: i2c-hid: show the error ...")Changes in v6:
- ACPI probe function should have been "static"
- Don't export suspend/resume, just exportdev_pm_opsfrom core.
- Fixed crash in ACPI module (missing init of "client")
- No need for regulator include in the core.
- Removedi2c_device_idtable from ACPI module.
- Suspend/resume are no longer exported from the core.Changes in v5:
- Addshutdown_tailop and use it in ACPI.
- Added mention of i2c-hid in the yaml itself as per Rob.
- Adjusted subject as per Rob.
-i2chid_subclass_data=>i2chid_ops.
-power_up_device=>power_up(same withpower_down).
- subclass => ops.Changes in v4:
- ("arm64: defconfig: Update config names for i2c-hid rejigger") new for v4.
- Fully rejigger so ACPI and OF are full subclasses.
- Totally redid based on the new subclass system.Changes in v3:
- Fixed compatible in example.
- Removed Benjamin as a maintainer.
- Rework to use subclassing.
- Updated description.Changes in v2:
- ("dt-bindings: HID: i2c-hid: Introduce bindings for the Goodix GT7375P") new in v2.
- Get timings based on the compatible string.
- Use a separate compatible string for this new touchscreen.Douglas Anderson (4):
HID: i2c-hid: Reorganize so ACPI and OF are separate modules
arm64: defconfig: Update config names for i2c-hid rejigger
dt-bindings: input: HID: i2c-hid: Introduce bindings for the GoodixGT7375PHID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core
.../bindings/input/goodix,gt7375p.yaml | 65 +++++ arch/arm64/configs/defconfig | 3 +- drivers/hid/Makefile | 2 +- drivers/hid/i2c-hid/Kconfig | 47 +++- drivers/hid/i2c-hid/Makefile | 6 +- drivers/hid/i2c-hid/i2c-hid-acpi.c | 143 ++++++++++ drivers/hid/i2c-hid/i2c-hid-core.c | 252 +++--------------- drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 116 ++++++++ drivers/hid/i2c-hid/i2c-hid-of.c | 143 ++++++++++
Quoted 9 lines
drivers/hid/i2c-hid/i2c-hid.h | 22 ++ include/linux/platform_data/i2c-hid.h | 41 --- 11 files changed, 578 insertions(+), 262 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7375p.yaml create mode 100644 drivers/hid/i2c-hid/i2c-hid-acpi.c create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-goodix.c create mode 100644 drivers/hid/i2c-hid/i2c-hid-of.c delete mode 100644 include/linux/platform_data/i2c-hid.h
Many thanks for the wait. I have now scheduled this series in for-5.12/i2c-hid.
Cheers,
Benjamin
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel