From fc9f88292dbad51fc33d2902149fb83efbba51c4 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Fri, 8 Jul 2022 10:38:03 -0600 Subject: mb/system76: Correct HID names for touchpad devices Use correct HID names instead of the CID names for the touchpad devices. Drop the now unneeded UID for the gaze15 TP devices. Tested on a gaze15 with a Synaptics device. Windows does not crash on boot and the touchpad is still detected as an I2C HID device. Change-Id: I5b6ab1a23ce667754d0c5757062385a721c5113f Signed-off-by: Tim Crawford Reviewed-on: https://review.coreboot.org/c/coreboot/+/65723 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier --- src/mainboard/system76/addw1/variants/addw1/overridetree.cb | 2 +- src/mainboard/system76/addw1/variants/addw2/overridetree.cb | 2 +- src/mainboard/system76/bonw14/devicetree.cb | 2 +- src/mainboard/system76/cml-u/variants/darp6/overridetree.cb | 2 +- src/mainboard/system76/darp7/devicetree.cb | 2 +- src/mainboard/system76/galp5/devicetree.cb | 2 +- src/mainboard/system76/gaze15/variants/gaze14/overridetree.cb | 2 +- src/mainboard/system76/gaze15/variants/gaze15/overridetree.cb | 6 ++---- src/mainboard/system76/lemp10/devicetree.cb | 2 +- src/mainboard/system76/oryp6/devicetree.cb | 2 +- src/mainboard/system76/whl-u/variants/darp5/overridetree.cb | 2 +- 11 files changed, 12 insertions(+), 14 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/system76/addw1/variants/addw1/overridetree.cb b/src/mainboard/system76/addw1/variants/addw1/overridetree.cb index 1a1f8b4a3b..b85706c93f 100644 --- a/src/mainboard/system76/addw1/variants/addw1/overridetree.cb +++ b/src/mainboard/system76/addw1/variants/addw1/overridetree.cb @@ -9,7 +9,7 @@ chip soc/intel/cannonlake subsystemid 0x1558 0x65d1 inherit device pci 15.0 on # I2C #0 chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""SYNA1202"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_B3_IRQ)" register "generic.probed" = "1" diff --git a/src/mainboard/system76/addw1/variants/addw2/overridetree.cb b/src/mainboard/system76/addw1/variants/addw2/overridetree.cb index 640f46eb0f..4ef8b1ed41 100644 --- a/src/mainboard/system76/addw1/variants/addw2/overridetree.cb +++ b/src/mainboard/system76/addw1/variants/addw2/overridetree.cb @@ -10,7 +10,7 @@ chip soc/intel/cannonlake device pci 15.0 on # I2C #0 chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""SYNA1202"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_A14_IRQ)" register "generic.probed" = "1" diff --git a/src/mainboard/system76/bonw14/devicetree.cb b/src/mainboard/system76/bonw14/devicetree.cb index 47e11d44d4..4bd92b8903 100644 --- a/src/mainboard/system76/bonw14/devicetree.cb +++ b/src/mainboard/system76/bonw14/devicetree.cb @@ -103,7 +103,7 @@ chip soc/intel/cannonlake device pci 14.5 off end # SDCard device pci 15.0 on # I2C #0 chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""SYNA1202"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E7_IRQ)" register "generic.probed" = "1" diff --git a/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb b/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb index ff2cdc790c..a3c6a4039b 100644 --- a/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb +++ b/src/mainboard/system76/cml-u/variants/darp6/overridetree.cb @@ -3,7 +3,7 @@ chip soc/intel/cannonlake subsystemid 0x1558 0x1404 inherit device pci 15.0 on chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""SYNA1202"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_C23_IRQ)" register "generic.probed" = "1" diff --git a/src/mainboard/system76/darp7/devicetree.cb b/src/mainboard/system76/darp7/devicetree.cb index dd356169ea..230c7f5fc1 100644 --- a/src/mainboard/system76/darp7/devicetree.cb +++ b/src/mainboard/system76/darp7/devicetree.cb @@ -229,7 +229,7 @@ chip soc/intel/tigerlake # Touchpad I2C bus register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""FTCS1000"" register "generic.desc" = ""FocalTech Touchpad"" register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_B3)" register "generic.probed" = "1" diff --git a/src/mainboard/system76/galp5/devicetree.cb b/src/mainboard/system76/galp5/devicetree.cb index 5650f2061f..4a525611b3 100644 --- a/src/mainboard/system76/galp5/devicetree.cb +++ b/src/mainboard/system76/galp5/devicetree.cb @@ -236,7 +236,7 @@ chip soc/intel/tigerlake # Touchpad I2C bus register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""FTCS1000"" register "generic.desc" = ""FocalTech Touchpad"" register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_B3)" register "generic.probed" = "1" diff --git a/src/mainboard/system76/gaze15/variants/gaze14/overridetree.cb b/src/mainboard/system76/gaze15/variants/gaze14/overridetree.cb index 91127a444d..1dc755ac09 100644 --- a/src/mainboard/system76/gaze15/variants/gaze14/overridetree.cb +++ b/src/mainboard/system76/gaze15/variants/gaze14/overridetree.cb @@ -11,7 +11,7 @@ chip soc/intel/cannonlake device pci 15.0 on # I2C0 chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""SYNA1202"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E7_IRQ)" register "generic.probed" = "1" diff --git a/src/mainboard/system76/gaze15/variants/gaze15/overridetree.cb b/src/mainboard/system76/gaze15/variants/gaze15/overridetree.cb index 8ce0399bd8..836f4f8b0d 100644 --- a/src/mainboard/system76/gaze15/variants/gaze15/overridetree.cb +++ b/src/mainboard/system76/gaze15/variants/gaze15/overridetree.cb @@ -11,18 +11,16 @@ chip soc/intel/cannonlake device pci 15.0 on # I2C0 chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""ELAN0412"" register "generic.desc" = ""ELAN Touchpad"" - register "generic.uid" = "0" register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E7_IRQ)" register "generic.probed" = "1" register "hid_desc_reg_offset" = "0x01" device i2c 15 on end end chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""SYNA1202"" register "generic.desc" = ""Synaptics Touchpad"" - register "generic.uid" = "1" register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E7_IRQ)" register "generic.probed" = "1" register "hid_desc_reg_offset" = "0x20" diff --git a/src/mainboard/system76/lemp10/devicetree.cb b/src/mainboard/system76/lemp10/devicetree.cb index 74bd7da99a..4e57fedd18 100644 --- a/src/mainboard/system76/lemp10/devicetree.cb +++ b/src/mainboard/system76/lemp10/devicetree.cb @@ -210,7 +210,7 @@ chip soc/intel/tigerlake # Touchpad I2C bus register "SerialIoI2cMode[PchSerialIoIndexI2C0]" = "PchSerialIoPci" chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""ELAN0412"" register "generic.desc" = ""ELAN Touchpad"" register "generic.irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_B3)" register "generic.probed" = "1" diff --git a/src/mainboard/system76/oryp6/devicetree.cb b/src/mainboard/system76/oryp6/devicetree.cb index e63e13694d..83c96fcfbb 100644 --- a/src/mainboard/system76/oryp6/devicetree.cb +++ b/src/mainboard/system76/oryp6/devicetree.cb @@ -99,7 +99,7 @@ chip soc/intel/cannonlake device pci 14.5 off end # SDCard device pci 15.0 on # I2C #0 chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""SYNA1202"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E7_IRQ)" register "generic.probed" = "1" diff --git a/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb b/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb index 0086905ef4..c3e0bb1b85 100644 --- a/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb +++ b/src/mainboard/system76/whl-u/variants/darp5/overridetree.cb @@ -3,7 +3,7 @@ chip soc/intel/cannonlake subsystemid 0x1558 0x1325 inherit device pci 15.0 on chip drivers/i2c/hid - register "generic.hid" = ""PNP0C50"" + register "generic.hid" = ""SYNA1202"" register "generic.desc" = ""Synaptics Touchpad"" register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_C23_IRQ)" register "generic.probed" = "1" -- cgit v1.2.3