diff options
| -rw-r--r-- | src/arch/x86/acpi_device.c | 13 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/acpi_device.h | 9 | ||||
| -rw-r--r-- | src/drivers/i2c/generic/chip.h | 4 | ||||
| -rw-r--r-- | src/drivers/i2c/generic/generic.c | 3 | ||||
| -rw-r--r-- | src/drivers/spi/acpi/acpi.c | 3 | ||||
| -rw-r--r-- | src/drivers/spi/acpi/chip.h | 5 |
6 files changed, 31 insertions, 6 deletions
diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c index de2d3375be..31e59eaf66 100644 --- a/src/arch/x86/acpi_device.c +++ b/src/arch/x86/acpi_device.c @@ -471,13 +471,15 @@ void acpi_device_write_spi(const struct acpi_spi *spi) /* PowerResource() with Enable and/or Reset control */ void acpi_device_add_power_res( struct acpi_gpio *reset, unsigned int reset_delay_ms, - struct acpi_gpio *enable, unsigned int enable_delay_ms) + struct acpi_gpio *enable, unsigned int enable_delay_ms, + struct acpi_gpio *stop, unsigned int stop_delay_ms) { static const char *power_res_dev_states[] = { "_PR0", "_PR3" }; unsigned int reset_gpio = reset->pins[0]; unsigned int enable_gpio = enable->pins[0]; + unsigned int stop_gpio = stop->pins[0]; - if (!reset_gpio && !enable_gpio) + if (!reset_gpio && !enable_gpio && !stop_gpio) return; /* PowerResource (PRIC, 0, 0) */ @@ -501,10 +503,17 @@ void acpi_device_add_power_res( if (reset_delay_ms) acpigen_write_sleep(reset_delay_ms); } + if (stop_gpio) { + acpigen_disable_tx_gpio(stop); + if (stop_delay_ms) + acpigen_write_sleep(stop_delay_ms); + } acpigen_pop_len(); /* _ON method */ /* Method (_OFF, 0, Serialized) */ acpigen_write_method_serialized("_OFF", 0); + if (stop_gpio) + acpigen_enable_tx_gpio(stop); if (reset_gpio) acpigen_enable_tx_gpio(reset); if (enable_gpio) diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h index 483fa477d7..d4d82fc1db 100644 --- a/src/arch/x86/include/arch/acpi_device.h +++ b/src/arch/x86/include/arch/acpi_device.h @@ -308,12 +308,17 @@ void acpi_device_write_spi(const struct acpi_spi *spi); /* * Add a basic PowerResource block for a device that includes - * GPIOs for enable and/or reset control of the device. Each + * GPIOs to control enable, reset and stop operation of the device. Each * GPIO is optional, but at least one must be provided. + * + * Reset - Put the device into / take the device out of reset. + * Enable - Enable / disable power to device. + * Stop - Stop / start operation of device. */ void acpi_device_add_power_res( struct acpi_gpio *reset, unsigned int reset_delay_ms, - struct acpi_gpio *enable, unsigned int enable_delay_ms); + struct acpi_gpio *enable, unsigned int enable_delay_ms, + struct acpi_gpio *stop, unsigned int stop_delay_ms); /* * Writing Device Properties objects via _DSD diff --git a/src/drivers/i2c/generic/chip.h b/src/drivers/i2c/generic/chip.h index 8b285f054c..037a8004bc 100644 --- a/src/drivers/i2c/generic/chip.h +++ b/src/drivers/i2c/generic/chip.h @@ -61,6 +61,10 @@ struct drivers_i2c_generic_config { struct acpi_gpio enable_gpio; /* Delay to be inserted after device is enabled. */ unsigned enable_delay_ms; + /* GPIO used to stop operation of device. */ + struct acpi_gpio stop_gpio; + /* Delay to be inserted after disabling stop. */ + unsigned stop_delay_ms; /* Generic properties for exporting device-specific data to the OS */ struct acpi_dp property_list[MAX_GENERIC_PROPERTY_LIST]; diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c index fa27b0e9fd..460f01514b 100644 --- a/src/drivers/i2c/generic/generic.c +++ b/src/drivers/i2c/generic/generic.c @@ -145,7 +145,8 @@ void i2c_generic_fill_ssdt(struct device *dev, if (config->has_power_resource) acpi_device_add_power_res( &config->reset_gpio, config->reset_delay_ms, - &config->enable_gpio, config->enable_delay_ms); + &config->enable_gpio, config->enable_delay_ms, + &config->stop_gpio, config->stop_delay_ms); /* Callback if any. */ if (callback) diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c index 102780f65d..2a39814c3d 100644 --- a/src/drivers/spi/acpi/acpi.c +++ b/src/drivers/spi/acpi/acpi.c @@ -168,7 +168,8 @@ static void spi_acpi_fill_ssdt_generator(struct device *dev) if (config->has_power_resource) acpi_device_add_power_res( &config->reset_gpio, config->reset_delay_ms, - &config->enable_gpio, config->enable_delay_ms); + &config->enable_gpio, config->enable_delay_ms, + &config->stop_gpio, config->stop_delay_ms); acpigen_pop_len(); /* Device */ acpigen_pop_len(); /* Scope */ diff --git a/src/drivers/spi/acpi/chip.h b/src/drivers/spi/acpi/chip.h index 6b54100536..35341d33be 100644 --- a/src/drivers/spi/acpi/chip.h +++ b/src/drivers/spi/acpi/chip.h @@ -47,6 +47,11 @@ struct drivers_spi_acpi_config { struct acpi_gpio enable_gpio; /* Delay to be inserted after device is enabled. */ unsigned enable_delay_ms; + + /* GPIO used to stop operation of device. */ + struct acpi_gpio stop_gpio; + /* Delay to be inserted after disabling stop. */ + unsigned stop_delay_ms; }; #endif /* __SPI_ACPI_CHIP_H__ */ |