summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/intel/glkrvp/Kconfig2
-rw-r--r--src/mainboard/intel/glkrvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb10
3 files changed, 10 insertions, 4 deletions
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index 56ab00b8a5..dfb53b8c5b 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -4,13 +4,13 @@ config BOARD_INTEL_BASEBOARD_GLKRVP
select SOC_INTEL_GLK
select BOARD_ROMSIZE_KB_16384
select DRIVERS_I2C_GENERIC
+ select DRIVERS_I2C_HID
select DRIVERS_PS2_KEYBOARD
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM2
- select DRIVERS_I2C_GENERIC
select DRIVERS_GENERIC_MAX98357A
select DRIVERS_I2C_DA7219
diff --git a/src/mainboard/intel/glkrvp/dsdt.asl b/src/mainboard/intel/glkrvp/dsdt.asl
index 0050665281..3a80f6c65a 100644
--- a/src/mainboard/intel/glkrvp/dsdt.asl
+++ b/src/mainboard/intel/glkrvp/dsdt.asl
@@ -65,6 +65,4 @@ DefinitionBlock(
/* Include common dptf ASL files */
#include <soc/intel/common/acpi/dptf/dptf.asl>
}
- #include "touchpad.asl"
- #include "touchpanel.asl"
}
diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb
index 4b939473bd..c0831459bd 100644
--- a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb
+++ b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb
@@ -143,7 +143,15 @@ chip soc/intel/apollolake
device pci 16.1 off end # - I2C 1
device pci 16.2 off end # - I2C 2
device pci 16.3 off end # - I2C 3
- device pci 17.0 on end # - I2C 4
+ device pci 17.0 on
+ chip drivers/i2c/hid
+ register "generic.hid" = ""ALPS0001""
+ register "generic.desc" = ""Touchpad""
+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_18_IRQ)"
+ register "hid_desc_reg_offset" = "0x1"
+ device i2c 2C on end
+ end
+ end # I2C 4
device pci 17.1 off end # - I2C 5
device pci 17.2 off end # - I2C 6
device pci 17.3 on end # - I2C 7