summaryrefslogtreecommitdiff
path: root/src/mainboard/google/octopus/variants
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@amd.corp-partner.google.com>2023-01-11 17:41:37 -0600
committerMartin L Roth <gaumless@gmail.com>2023-01-15 02:01:48 +0000
commit4902e9b35f1b62c2c28e582e33ad55d2543f1483 (patch)
treeecf83ae2983dbf3318bbb2bf315eee6cc3ed903d /src/mainboard/google/octopus/variants
parent2e6c55946c4d4ff04e1bc8de7272a4cef63ed55d (diff)
drivers/i2c/generic: Drop 'disable_gpio_export_in_crs' flag
Exposing the GPIOs via an ACPI PowerResource and the _CRS results in the OS driver and ACPI thinking they own the GPIO. This can cause timing problems because it's not clear which system should be controlling the GPIO. Previously, we flagged as an error any device which set the 'has_power_resource' flag but did not set 'disable_gpio_export_in_crs.' There's no reason to require explicit disablement however, so drop the superfluous 'disable' flag, and change the _CRS generation to check if the GPIOs will be exported via the 'has_power_resource' flag instead. BUG=b:265055477 TEST=build/boot skyrim, dump SSDT and verify touchscreen GPIOs only listed under PRx, not under _CRS. Change-Id: I837ae6c6fe4b8e1c4e10686406cba06bdb7759d2 Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/71849 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin L Roth <gaumless@gmail.com>
Diffstat (limited to 'src/mainboard/google/octopus/variants')
-rw-r--r--src/mainboard/google/octopus/variants/ampton/overridetree.cb1
-rw-r--r--src/mainboard/google/octopus/variants/bloog/overridetree.cb1
-rw-r--r--src/mainboard/google/octopus/variants/bobba/overridetree.cb1
-rw-r--r--src/mainboard/google/octopus/variants/dood/overridetree.cb1
-rw-r--r--src/mainboard/google/octopus/variants/fleex/overridetree.cb2
-rw-r--r--src/mainboard/google/octopus/variants/foob/overridetree.cb2
-rw-r--r--src/mainboard/google/octopus/variants/garg/overridetree.cb1
-rw-r--r--src/mainboard/google/octopus/variants/meep/overridetree.cb2
-rw-r--r--src/mainboard/google/octopus/variants/phaser/overridetree.cb2
9 files changed, 0 insertions, 13 deletions
diff --git a/src/mainboard/google/octopus/variants/ampton/overridetree.cb b/src/mainboard/google/octopus/variants/ampton/overridetree.cb
index 5518246830..fdfc01296a 100644
--- a/src/mainboard/google/octopus/variants/ampton/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/ampton/overridetree.cb
@@ -132,7 +132,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
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 40 on end
end
diff --git a/src/mainboard/google/octopus/variants/bloog/overridetree.cb b/src/mainboard/google/octopus/variants/bloog/overridetree.cb
index 536838e34c..83880ec533 100644
--- a/src/mainboard/google/octopus/variants/bloog/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/bloog/overridetree.cb
@@ -161,7 +161,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
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 40 on end
end
diff --git a/src/mainboard/google/octopus/variants/bobba/overridetree.cb b/src/mainboard/google/octopus/variants/bobba/overridetree.cb
index e5eaffae92..8a48d22def 100644
--- a/src/mainboard/google/octopus/variants/bobba/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/bobba/overridetree.cb
@@ -220,7 +220,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
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 40 on end
end
diff --git a/src/mainboard/google/octopus/variants/dood/overridetree.cb b/src/mainboard/google/octopus/variants/dood/overridetree.cb
index bb479dfd5c..de923c4f46 100644
--- a/src/mainboard/google/octopus/variants/dood/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/dood/overridetree.cb
@@ -155,7 +155,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
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 40 on end
end
diff --git a/src/mainboard/google/octopus/variants/fleex/overridetree.cb b/src/mainboard/google/octopus/variants/fleex/overridetree.cb
index f589b5b2ed..9a4cdee290 100644
--- a/src/mainboard/google/octopus/variants/fleex/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/fleex/overridetree.cb
@@ -194,7 +194,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
register "generic.enable_delay_ms" = "2"
register "generic.has_power_resource" = "1"
- register "generic.disable_gpio_export_in_crs" = "1"
register "hid_desc_reg_offset" = "0x20"
device i2c 2c on end
end
@@ -208,7 +207,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
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 40 on end
end
diff --git a/src/mainboard/google/octopus/variants/foob/overridetree.cb b/src/mainboard/google/octopus/variants/foob/overridetree.cb
index 695a00ba04..c47b0de84b 100644
--- a/src/mainboard/google/octopus/variants/foob/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/foob/overridetree.cb
@@ -144,7 +144,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
register "generic.reset_delay_ms" = "20"
register "generic.has_power_resource" = "1"
- register "generic.disable_gpio_export_in_crs" = "1"
register "hid_desc_reg_offset" = "0x01"
device i2c 10 on end
end
@@ -157,7 +156,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
register "generic.reset_delay_ms" = "45"
register "generic.has_power_resource" = "1"
- register "generic.disable_gpio_export_in_crs" = "1"
register "hid_desc_reg_offset" = "0x20"
device i2c 20 on end
end
diff --git a/src/mainboard/google/octopus/variants/garg/overridetree.cb b/src/mainboard/google/octopus/variants/garg/overridetree.cb
index 83a7429e92..86b4342a49 100644
--- a/src/mainboard/google/octopus/variants/garg/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/garg/overridetree.cb
@@ -197,7 +197,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
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 40 on end
end
diff --git a/src/mainboard/google/octopus/variants/meep/overridetree.cb b/src/mainboard/google/octopus/variants/meep/overridetree.cb
index 33fedc59bf..6623fa0c37 100644
--- a/src/mainboard/google/octopus/variants/meep/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/meep/overridetree.cb
@@ -228,7 +228,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
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" = "0x20"
device i2c 2c on end
end
@@ -242,7 +241,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
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 40 on end
end
diff --git a/src/mainboard/google/octopus/variants/phaser/overridetree.cb b/src/mainboard/google/octopus/variants/phaser/overridetree.cb
index 3d38634256..748481dc88 100644
--- a/src/mainboard/google/octopus/variants/phaser/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/phaser/overridetree.cb
@@ -170,7 +170,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
register "generic.reset_delay_ms" = "45"
register "generic.has_power_resource" = "1"
- register "generic.disable_gpio_export_in_crs" = "1"
register "hid_desc_reg_offset" = "0x20"
device i2c 20 on end
end
@@ -196,7 +195,6 @@ chip soc/intel/apollolake
register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
register "generic.reset_delay_ms" = "70"
register "generic.has_power_resource" = "1"
- register "generic.disable_gpio_export_in_crs" = "1"
register "hid_desc_reg_offset" = "0x01"
device i2c 40 on end
end