David Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52967 )
Change subject: mb/google/dedede/var/magolor: Select elan hidi2c address based on FW_CONFIG value ......................................................................
mb/google/dedede/var/magolor: Select elan hidi2c address based on FW_CONFIG value
Select elan hidi2c address 0x10 for magister, based on the value set in the FW_CONFIG.
BUG=b:186609348 TEST=build and boot to OS.
Signed-off-by: David Wu david_wu@quanta.corp-partner.google.com Change-Id: Id157096a83e7265f6e01e353256e08f9672224f8 --- M src/mainboard/google/dedede/variants/baseboard/devicetree.cb M src/mainboard/google/dedede/variants/magolor/overridetree.cb 2 files changed, 30 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/52967/1
diff --git a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb index f33995c..f981ed0 100644 --- a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb @@ -17,6 +17,10 @@ option RT1015_I2C 2 option RT1015P_AUTO 3 end + field ELAN_HID_ADD 17 + option ELAN_NONE 0 + option ELAN_ADD10 1 + end end
chip soc/intel/jasperlake diff --git a/src/mainboard/google/dedede/variants/magolor/overridetree.cb b/src/mainboard/google/dedede/variants/magolor/overridetree.cb index 841f7d6..ce82f96 100644 --- a/src/mainboard/google/dedede/variants/magolor/overridetree.cb +++ b/src/mainboard/google/dedede/variants/magolor/overridetree.cb @@ -181,7 +181,29 @@ 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 + end + end + chip drivers/i2c/hid + register "generic.hid" = ""ELAN6918"" + 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 +215,9 @@ 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 + end end chip drivers/i2c/generic register "hid" = ""RAYD0001""