[coreboot-gerrit] Change in coreboot[master]: mainboard/google/zoombini/variants/meowth: enable touchscreen

[Nick Vaccaro (Code Review)]

Nick Vaccaro has uploaded this change for review. ( https://review.coreboot.org/23551


Change subject: mainboard/google/zoombini/variants/meowth: enable touchscreen
......................................................................

mainboard/google/zoombini/variants/meowth: enable touchscreen

BUG=b:69011806, b:72179988
BRANCH=master
TEST=Verify touchscreen on meowth works with this change.

Change-Id: Iad3f0b77a02552266435e523fdbb74b14ada101a
Signed-off-by: Nick Vaccaro <nvaccaro at google.com>
---
M src/mainboard/google/zoombini/Kconfig
M src/mainboard/google/zoombini/variants/meowth/devicetree.cb
M src/mainboard/google/zoombini/variants/meowth/gpio.c
3 files changed, 21 insertions(+), 3 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/23551/1

diff --git a/src/mainboard/google/zoombini/Kconfig b/src/mainboard/google/zoombini/Kconfig
index 64180f3..31b8cc9 100644
--- a/src/mainboard/google/zoombini/Kconfig
+++ b/src/mainboard/google/zoombini/Kconfig
@@ -3,6 +3,7 @@
 	def_bool n
 	select BOARD_ROMSIZE_KB_16384
 	select DRIVERS_I2C_GENERIC
+	select DRIVERS_I2C_HID
 	select DRIVERS_SPI_ACPI
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_LPC
diff --git a/src/mainboard/google/zoombini/variants/meowth/devicetree.cb b/src/mainboard/google/zoombini/variants/meowth/devicetree.cb
index 88de878..4d40b63 100644
--- a/src/mainboard/google/zoombini/variants/meowth/devicetree.cb
+++ b/src/mainboard/google/zoombini/variants/meowth/devicetree.cb
@@ -53,6 +53,13 @@
 	register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)"
 	register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC3)"
 
+	# Touchscreen
+	register "i2c[0]" = "{
+		.speed = I2C_SPEED_FAST_PLUS,
+		.rise_time_ns = 98,
+		.fall_time_ns = 38,
+	}"
+
 	device domain 0 on
 		device pci 00.0 on  end # Host Bridge
 		device pci 02.0 on  end # Integrated Graphics Device
@@ -63,7 +70,16 @@
 		device pci 14.0 on  end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
 		device pci 14.5 off end # SDCard
-		device pci 15.0 on  end # I2C #0
+                device pci 15.0 on
+                        chip drivers/i2c/hid
+                                register "generic.hid" = ""WCOM50C1""
+                                register "generic.desc" = ""WCOM Digitizer""
+                                register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_C14_IRQ)"
+                                register "generic.speed" = "I2C_SPEED_FAST_PLUS"
+                                register "hid_desc_reg_offset" = "0x1"
+                                device i2c 0a on end
+                        end
+                end # I2C #0
 		device pci 15.1 on  end # I2C #1
 		device pci 15.2 on  end # I2C #2
 		device pci 15.3 on  end # I2C #3
@@ -110,6 +126,7 @@
 				device spi 0 on end
 			end
 		end # GSPI #1
+		device pci 1e.3 on  end # GSPI #1
 		device pci 1f.0 on
 			chip ec/google/chromeec
 				device pnp 0c09.0 on end
diff --git a/src/mainboard/google/zoombini/variants/meowth/gpio.c b/src/mainboard/google/zoombini/variants/meowth/gpio.c
index 19c028e..21c4bbc 100644
--- a/src/mainboard/google/zoombini/variants/meowth/gpio.c
+++ b/src/mainboard/google/zoombini/variants/meowth/gpio.c
@@ -94,13 +94,13 @@
 				   NF1), /* UART_PCH_RX_DEBUG_TX */
 /* UART0_TXD */		PAD_CFG_NF(GPP_C9, NONE, DEEP,
 				   NF1), /* UART_PCH_TX_DEBUG_RX */
-/* UART0_RTS# */	PAD_CFG_GPO(GPP_C10, 0, DEEP), /* PP3300_TOUCH_EN */
+/* UART0_RTS# */	PAD_CFG_GPO(GPP_C10, 1, DEEP), /* PP3300_TOUCH_EN */
 /* UART0_CTS# */	PAD_NC(GPP_C11, NONE),
 /* Only P0 boards need an internal pullup */
 /* UART1_RXD */         PAD_CFG_GPI_APIC(GPP_C12, UP_20K, DEEP, EDGE_SINGLE,
 					 INVERT), /* H1_PCH_INT_ODL */
 /* UART1_TXD */		PAD_NC(GPP_C13, NONE),
-/* UART1_RTS# */	PAD_CFG_GPI_SCI(GPP_C14, NONE, DEEP, EDGE_SINGLE,
+/* UART1_RTS# */	PAD_CFG_GPI_APIC(GPP_C14, NONE, DEEP, LEVEL,
 					NONE), /* TOUCHSCREEN_INT_ODL */
 /* UART1_CTS# */	PAD_NC(GPP_C15, NONE),
 /* I2C0_SDA */		PAD_CFG_NF(GPP_C16, NONE, DEEP,

-- 
To view, visit https://review.coreboot.org/23551
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad3f0b77a02552266435e523fdbb74b14ada101a
Gerrit-Change-Number: 23551
Gerrit-PatchSet: 1
Gerrit-Owner: Nick Vaccaro <nvaccaro at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180201/2b3d2dc9/attachment-0001.html>