tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 13882369 ac34bb40

-80
-71
Documentation/devicetree/bindings/input/goodix,gt7986u.yaml
··· 1 - # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 - %YAML 1.2 3 - --- 4 - $id: http://devicetree.org/schemas/input/goodix,gt7986u.yaml# 5 - $schema: http://devicetree.org/meta-schemas/core.yaml# 6 - 7 - title: GOODIX GT7986U SPI HID Touchscreen 8 - 9 - maintainers: 10 - - Charles Wang <charles.goodix@gmail.com> 11 - 12 - description: Supports the Goodix GT7986U touchscreen. 13 - This touch controller reports data packaged according to the HID protocol, 14 - but is incompatible with Microsoft's HID-over-SPI protocol. 15 - 16 - allOf: 17 - - $ref: /schemas/spi/spi-peripheral-props.yaml# 18 - 19 - properties: 20 - compatible: 21 - enum: 22 - - goodix,gt7986u 23 - 24 - reg: 25 - maxItems: 1 26 - 27 - interrupts: 28 - maxItems: 1 29 - 30 - reset-gpios: 31 - maxItems: 1 32 - 33 - goodix,hid-report-addr: 34 - $ref: /schemas/types.yaml#/definitions/uint32 35 - description: 36 - The register address for retrieving HID report data. 37 - This address is related to the device firmware and may 38 - change after a firmware update. 39 - 40 - spi-max-frequency: true 41 - 42 - additionalProperties: false 43 - 44 - required: 45 - - compatible 46 - - reg 47 - - interrupts 48 - - reset-gpios 49 - - goodix,hid-report-addr 50 - 51 - examples: 52 - - | 53 - #include <dt-bindings/interrupt-controller/irq.h> 54 - #include <dt-bindings/gpio/gpio.h> 55 - 56 - spi { 57 - #address-cells = <1>; 58 - #size-cells = <0>; 59 - 60 - touchscreen@0 { 61 - compatible = "goodix,gt7986u"; 62 - reg = <0>; 63 - interrupt-parent = <&gpio>; 64 - interrupts = <25 IRQ_TYPE_LEVEL_LOW>; 65 - reset-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; 66 - spi-max-frequency = <10000000>; 67 - goodix,hid-report-addr = <0x22c8c>; 68 - }; 69 - }; 70 - 71 - ...
-9
drivers/hid/hid-goodix-spi.c
··· 786 786 MODULE_DEVICE_TABLE(acpi, goodix_spi_acpi_match); 787 787 #endif 788 788 789 - #ifdef CONFIG_OF 790 - static const struct of_device_id goodix_spi_of_match[] = { 791 - { .compatible = "goodix,gt7986u", }, 792 - { } 793 - }; 794 - MODULE_DEVICE_TABLE(of, goodix_spi_of_match); 795 - #endif 796 - 797 789 static const struct spi_device_id goodix_spi_ids[] = { 798 790 { "gt7986u" }, 799 791 { }, ··· 796 804 .driver = { 797 805 .name = "goodix-spi-hid", 798 806 .acpi_match_table = ACPI_PTR(goodix_spi_acpi_match), 799 - .of_match_table = of_match_ptr(goodix_spi_of_match), 800 807 .pm = pm_sleep_ptr(&goodix_spi_pm_ops), 801 808 }, 802 809 .probe = goodix_spi_probe,