projects/linux·commit 13882369

Merge tag 'hid-for-linus-2024092601' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

13882369 · Linus Torvalds <[email protected]> · 2024-09-26 09:25:28 -07:00

Pull HID fix from Jiri Kosina:
 "A revert of Device Tree binding for Goodix SPI HID driver (while
  keeping ACPI still available), as it conflicted with already existing
  binding and the original submitter didn't respond in time with a fix.

  We will be looking into ways how to reintroduce it properly (we have
  to agree on a way how to handle cases where vendor uses the very same
  product ID for I2C and SPI parts, leading to this kind conflict). But
  before that is settled, let's revert the to unbreak everybody else
  (Krzysztof Kozlowski)"

* tag 'hid-for-linus-2024092601' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  dt-bindings: input: Revert "dt-bindings: input: Goodix SPI HID Touchscreen"
  HID: hid-goodix: drop unsupported and undocumented DT part
Commit
13882369ceb9b0953f9f5ff8563bbccfd80d0ffd
Parents
ac34bb40 · 1ee68f17

Merge commit. Changes below are compared with the first parent: ac34bb40.

Changes

2 files changed · +0 −80

FileStatusAddDelContent
Documentation/devicetree/bindings/input/goodix,gt7986u.yamldeleted+0−71View before deletion
drivers/hid/hid-goodix-spi.cmodified+0−9View file

Documentation/devicetree/bindings/input/goodix,gt7986u.yaml

View before deletion
diff --git a/Documentation/devicetree/bindings/input/goodix,gt7986u.yaml b/Documentation/devicetree/bindings/input/goodix,gt7986u.yaml
deleted file mode 100644
index a7d42a5..0000000
--- a/Documentation/devicetree/bindings/input/goodix,gt7986u.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/input/goodix,gt7986u.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: GOODIX GT7986U SPI HID Touchscreen
-
-maintainers:
- - Charles Wang <[email protected]>
-
-description: Supports the Goodix GT7986U touchscreen.
- This touch controller reports data packaged according to the HID protocol,
- but is incompatible with Microsoft's HID-over-SPI protocol.
-
-allOf:
- - $ref: /schemas/spi/spi-peripheral-props.yaml#
-
-properties:
- compatible:
- enum:
- - goodix,gt7986u
-
- reg:
- maxItems: 1
-
- interrupts:
- maxItems: 1
-
- reset-gpios:
- maxItems: 1
-
- goodix,hid-report-addr:
- $ref: /schemas/types.yaml#/definitions/uint32
- description:
- The register address for retrieving HID report data.
- This address is related to the device firmware and may
- change after a firmware update.
-
- spi-max-frequency: true
-
-additionalProperties: false
-
-required:
- - compatible
- - reg
- - interrupts
- - reset-gpios
- - goodix,hid-report-addr
-
-examples:
- - |
- #include <dt-bindings/interrupt-controller/irq.h>
- #include <dt-bindings/gpio/gpio.h>
-
- spi {
- #address-cells = <1>;
- #size-cells = <0>;
-
- touchscreen@0 {
- compatible = "goodix,gt7986u";
- reg = <0>;
- interrupt-parent = <&gpio>;
- interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
- reset-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
- spi-max-frequency = <10000000>;
- goodix,hid-report-addr = <0x22c8c>;
- };
- };
-
-...

drivers/hid/hid-goodix-spi.c

View file
diff --git a/drivers/hid/hid-goodix-spi.c b/drivers/hid/hid-goodix-spi.c
index de655f7..0e59663 100644
--- a/drivers/hid/hid-goodix-spi.c
+++ b/drivers/hid/hid-goodix-spi.c
@@ -786,14 +786,6 @@ static const struct acpi_device_id goodix_spi_acpi_match[] = {
MODULE_DEVICE_TABLE(acpi, goodix_spi_acpi_match);
#endif
-#ifdef CONFIG_OF
-static const struct of_device_id goodix_spi_of_match[] = {
- { .compatible = "goodix,gt7986u", },
- { }
-};
-MODULE_DEVICE_TABLE(of, goodix_spi_of_match);
-#endif
-
static const struct spi_device_id goodix_spi_ids[] = {
{ "gt7986u" },
{ },
@@ -804,7 +796,6 @@ static struct spi_driver goodix_spi_driver = {
.driver = {
.name = "goodix-spi-hid",
.acpi_match_table = ACPI_PTR(goodix_spi_acpi_match),
- .of_match_table = of_match_ptr(goodix_spi_of_match),
.pm = pm_sleep_ptr(&goodix_spi_pm_ops),
},
.probe = goodix_spi_probe,