diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-26 09:25:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-26 09:25:28 -0700 |
| commit | 13882369ceb9b0953f9f5ff8563bbccfd80d0ffd (patch) | |
| tree | d5f3ef0438cc5f021423aa6252f766f14712819a /drivers | |
| parent | ac34bb40f748593e585f4c414a59cf4404249a15 (diff) | |
| parent | 1ee68f172482ab3d165468b989026fe67d6ea908 (diff) | |
| download | lwn-13882369ceb9b0953f9f5ff8563bbccfd80d0ffd.tar.gz lwn-13882369ceb9b0953f9f5ff8563bbccfd80d0ffd.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-goodix-spi.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/hid/hid-goodix-spi.c b/drivers/hid/hid-goodix-spi.c index de655f745d3f..0e59663814dd 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, |