diff options
Diffstat (limited to 'src/drivers/i2c')
-rw-r--r-- | src/drivers/i2c/generic/chip.h | 3 | ||||
-rw-r--r-- | src/drivers/i2c/generic/generic.c | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/drivers/i2c/generic/chip.h b/src/drivers/i2c/generic/chip.h index a99b09536e..0942d00fc1 100644 --- a/src/drivers/i2c/generic/chip.h +++ b/src/drivers/i2c/generic/chip.h @@ -46,9 +46,6 @@ struct drivers_i2c_generic_config { unsigned int device_present_gpio; unsigned int device_present_gpio_invert; - /* Disable reset and enable GPIO export in _CRS */ - bool disable_gpio_export_in_crs; - /* Does the device have a power resource? */ bool has_power_resource; diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c index 15fe7adebb..d1baeb76f4 100644 --- a/src/drivers/i2c/generic/generic.c +++ b/src/drivers/i2c/generic/generic.c @@ -17,10 +17,10 @@ static bool i2c_generic_add_gpios_to_crs(struct drivers_i2c_generic_config *cfg) { /* * Return false if: - * 1. Request to explicitly disable export of GPIOs in CRS, or + * 1. GPIOs are exported via a power resource, or * 2. Both reset and enable GPIOs are not provided. */ - if (cfg->disable_gpio_export_in_crs || + if (cfg->has_power_resource || ((cfg->reset_gpio.pin_count == 0) && (cfg->enable_gpio.pin_count == 0))) return false; @@ -77,16 +77,6 @@ void i2c_generic_fill_ssdt(const struct device *dev, } } - if (config->has_power_resource && !config->disable_gpio_export_in_crs) { - /* - * This case will most likely cause timing problems. The OS driver might be - * controlling the GPIOs, but the ACPI Power Resource will also be controlling - * them. This will result in the two fighting and stomping on each other. - */ - printk(BIOS_ERR, "%s: Exposing GPIOs in Power Resource and _CRS\n", - dev_path(dev)); - } - /* Device */ acpigen_write_scope(scope); acpigen_write_device(acpi_device_name(dev)); |