hid-for-linus-2024092601

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIVAwUAZvUquKZi849r7WBJAQI3Vw//a5wR3nxnbhKa4fKjRj7Afw62NKXvFpJr
 1hA0cxqKf2vpIVuS28ZbypkBecFLbD92/4Xnd/ZQsEa3dY2F69AKe120ujd5CRJn
 CJUGxWV2+J55ScLFnH61mzNmZ+LlYKPRN5lqIlVgZS1FP8oKt1Zu0G9mI0JByAqV
 +u9iSvy2Mf169AHRuZhMqBJitcvYrpQ5pZJpgGUdPkJch3ChgkVLROJJiXkIB5GY
 8XOpCtfLFQusTMEaiN7CZWRdkUgfSQ4f1nw5j/rIi8oHShgWGeN4hr2/UMO9iU93
 O1fnXVwRfYoycOH8TZiNygOyNnFp5q2/AvCk3Y+kpBvkPkDeu3zcrUp8EBqfXbbD
 iumU7UDOAdvn/MtFTmbENHBH6qYDGCxfUfznKnw9LcKc/fu0HYGjSd9AIq9wMVqy
 sAa9bfpWbG2XbwbAA2KHKBhbSoM4CpNWAihBzEu1ed81RWY5URWhlG9EdmhmJtiQ
 ndAHrW/b9M+UIbUJ8oQdXNtWI6x9WXA+hymy9rPGd+xR1DdLPcDv/iQlUHO7y+Wy
 6xyQ06po+cJC8AXXUMBaP2fcVHcG54UgZWUCBKRG/OqVRCU5Um2sFVYILDxKt3n7
 bwLNCJyxo4mz+y3UKCHoXyCye2fP7g9ckSmxvacq8ZpR8IV2X3hrl+k83o+w8Eqh
 yjbwGcAv6+A=
 =aSwK
 -----END PGP SIGNATURE-----

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

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

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

@@ -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 <charles.goodix@gmail.com>
-
-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

@@ -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,