[S] Change in coreboot[master]: mb/google/kahlee/liara/devicetree: move Raydium touchscreen to baseboard

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/68770 )

Change subject: mb/google/kahlee/liara/devicetree: move Raydium touchscreen to baseboard
......................................................................

mb/google/kahlee/liara/devicetree: move Raydium touchscreen to baseboard

Move the Raydium touchscreen to the baseboard devicetree. Since only the
liara variant uses a level IRQ as I2C devices are supposed to, all other
board variants still override this to use an edge IRQ which were added
as a workaround to make the touchscreen work on the other devices. Right
now it's unclear to me if that edge IRQ workaround was only needed
temporarily and can now be removed, so I'll keep it as it was for now.
If this turns out to be no longer needed on the other variants, the
overrides can be dropped in the future.

Signed-off-by: Felix Held 
Change-Id: Ic621c1a5856e9e280a25b0668010a1ee5bbb61e4
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68770
Reviewed-by: Matt DeVillier 
Tested-by: build bot (Jenkins) 
Reviewed-by: Paul Menzel 
---
M src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
M src/mainboard/google/kahlee/variants/liara/overridetree.cb
2 files changed, 35 insertions(+), 14 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Matt DeVillier: Looks good to me, approved

diff --git a/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb b/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
index 2f6e0da..fc74d77 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
@@ -85,6 +85,18 @@
    end
    device ref i2c_3 on
    	chip drivers/i2c/generic
+			register "hid" = ""RAYD0001""
+			register "desc" = ""Raydium Touchscreen""
+			register "probed" = "1"
+			register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_11)"
+			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_85)"
+			register "reset_delay_ms" = "20"
+			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_76)"
+			register "enable_delay_ms" = "1"
+			register "has_power_resource" = "1"
+			device i2c 39 on end
+		end
+		chip drivers/i2c/generic
    		register "hid" = ""ELAN0001""
    		register "desc" = ""ELAN Touchscreen""
    		register "probed" = "1"
diff --git a/src/mainboard/google/kahlee/variants/liara/overridetree.cb b/src/mainboard/google/kahlee/variants/liara/overridetree.cb
index 1d750b8..7b1c2d3 100644
--- a/src/mainboard/google/kahlee/variants/liara/overridetree.cb
+++ b/src/mainboard/google/kahlee/variants/liara/overridetree.cb
@@ -50,18 +50,4 @@
    		device i2c 2c on end
    	end
    end
-	device ref i2c_3 on
-		chip drivers/i2c/generic
-			register "hid" = ""RAYD0001""
-			register "desc" = ""Raydium Touchscreen""
-			register "probed" = "1"
-			register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPIO_11)"
-			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_85)"
-			register "reset_delay_ms" = "20"
-			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_76)"
-			register "enable_delay_ms" = "1"
-			register "has_power_resource" = "1"
-			device i2c 39 on end
-		end
-	end
 end	#chip soc/amd/stoneyridge