Change in coreboot[master]: mb/google/dedede/var/magolor: Select elan hidi2c address based on SSF...

[David Wu (Code Review)]

David Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52851 )

Change subject: mb/google/dedede/var/magolor: Select elan hidi2c address based on SSFC value
......................................................................

mb/google/dedede/var/magolor: Select elan hidi2c address based on SSFC value

Select elan hidi2c address 0x10 or 0x15, based on
the value set in the SSFC_CONFIG.

BUG=b:186609348
TEST=build and boot to OS.

Change-Id: I087ea677a8865fc8c5b3f7c9773bd7f97924dbb3
---
M src/mainboard/google/dedede/variants/magolor/overridetree.cb
1 file changed, 33 insertions(+), 2 deletions(-)

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

diff --git a/src/mainboard/google/dedede/variants/magolor/overridetree.cb b/src/mainboard/google/dedede/variants/magolor/overridetree.cb
index 841f7d6..799d808 100644
--- a/src/mainboard/google/dedede/variants/magolor/overridetree.cb
+++ b/src/mainboard/google/dedede/variants/magolor/overridetree.cb
@@ -4,6 +4,11 @@
    	option CAMERA_OVTI5675 1
    	option CAMERA_OVTI8856 2
    end
+	field ELAN_HID_ADD 41 42
+		option ELAN_NONE 0
+		option ELAN_ADD10 1
+		option ELAN_ADD15 2
+	end
 end

chip soc/intel/jasperlake
@@ -181,7 +186,30 @@
    			register "generic.has_power_resource" = "1"
    			register "generic.disable_gpio_export_in_crs" = "1"
    			register "hid_desc_reg_offset" = "0x01"
-				device i2c 15 on end
+				device i2c 15 on
+					probe ELAN_HID_ADD ELAN_NONE
+					probe ELAN_HID_ADD ELAN_ADD15
+				end
+			end
+			chip drivers/i2c/hid
+				register "generic.hid" = ""ELAN9004""
+				register "generic.desc" = ""ELAN Touchscreen""
+				register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D4_IRQ)"
+				register "generic.probed" = "1"
+				register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D5)"
+				register "generic.reset_delay_ms" = "20"
+				register "generic.reset_off_delay_ms" = "2"
+				register "generic.stop_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A11)"
+				register "generic.stop_delay_ms" = "280"
+				register "generic.stop_off_delay_ms" = "2"
+				register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D6)"
+				register "generic.enable_delay_ms" = "1"
+				register "generic.has_power_resource" = "1"
+				register "generic.disable_gpio_export_in_crs" = "1"
+				register "hid_desc_reg_offset" = "0x01"
+				device i2c 10 on
+					probe ELAN_HID_ADD ELAN_ADD10
+				end
    		end
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0001""
@@ -193,7 +221,10 @@
    			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D6)"
    			register "enable_delay_ms" = "1"
    			register "has_power_resource" = "1"
-				device i2c 10 on end
+				device i2c 10 on
+					probe ELAN_HID_ADD ELAN_NONE
+					probe ELAN_HID_ADD ELAN_ADD15
+				end
    		end
    		chip drivers/i2c/generic
    			register "hid" = ""RAYD0001""