Skip to content

Commit 1388236

Browse files
committed
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
2 parents ac34bb4 + 1ee68f1 commit 1388236

File tree

2 files changed

+0
-80
lines changed

2 files changed

+0
-80
lines changed

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

Lines changed: 0 additions & 71 deletions
This file was deleted.

drivers/hid/hid-goodix-spi.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -786,14 +786,6 @@ static const struct acpi_device_id goodix_spi_acpi_match[] = {
786786
MODULE_DEVICE_TABLE(acpi, goodix_spi_acpi_match);
787787
#endif
788788

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-
797789
static const struct spi_device_id goodix_spi_ids[] = {
798790
{ "gt7986u" },
799791
{ },
@@ -804,7 +796,6 @@ static struct spi_driver goodix_spi_driver = {
804796
.driver = {
805797
.name = "goodix-spi-hid",
806798
.acpi_match_table = ACPI_PTR(goodix_spi_acpi_match),
807-
.of_match_table = of_match_ptr(goodix_spi_of_match),
808799
.pm = pm_sleep_ptr(&goodix_spi_pm_ops),
809800
},
810801
.probe = goodix_spi_probe,

0 commit comments

Comments
 (0)