mb/glkrvp: Enable Touchpad

This patch enables the APLS touchpad in glkrvp platform.

TEST= Boot and test touchpad works.

Change-Id: I6f52f7db57ab52b5531e647bde2adbb78b40f76f
Signed-off-by: Shaunak Saha <shaunak.saha@intel.com>
Reviewed-on: https://review.coreboot.org/22627
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index 56ab00b..dfb53b8 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -4,13 +4,13 @@
 	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 0050665..3a80f6c 100644
--- a/src/mainboard/intel/glkrvp/dsdt.asl
+++ b/src/mainboard/intel/glkrvp/dsdt.asl
@@ -65,6 +65,4 @@
 		/* 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 4b93947..c083145 100644
--- a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb
+++ b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb
@@ -143,7 +143,15 @@
 		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