2 files changed, 64 insertions, 27 deletions

diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c
index 31e59eaf66..c8d313e037 100644
--- a/src/arch/x86/acpi_device.c
+++ b/src/arch/x86/acpi_device.c
@@ -469,15 +469,12 @@ 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 *stop, unsigned int stop_delay_ms)
+void acpi_device_add_power_res(const struct acpi_power_res_params *params)
 {
 	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];
+	unsigned int reset_gpio = params->reset_gpio->pins[0];
+	unsigned int enable_gpio = params->enable_gpio->pins[0];
+	unsigned int stop_gpio = params->stop_gpio->pins[0];
 
 	if (!reset_gpio && !enable_gpio && !stop_gpio)
 		return;
@@ -492,32 +489,41 @@ void acpi_device_add_power_res(
 	/* Method (_ON, 0, Serialized) */
 	acpigen_write_method_serialized("_ON", 0);
 	if (reset_gpio)
-		acpigen_enable_tx_gpio(reset);
+		acpigen_enable_tx_gpio(params->reset_gpio);
 	if (enable_gpio) {
-		acpigen_enable_tx_gpio(enable);
-		if (enable_delay_ms)
-			acpigen_write_sleep(enable_delay_ms);
+		acpigen_enable_tx_gpio(params->enable_gpio);
+		if (params->enable_delay_ms)
+			acpigen_write_sleep(params->enable_delay_ms);
 	}
 	if (reset_gpio) {
-		acpigen_disable_tx_gpio(reset);
-		if (reset_delay_ms)
-			acpigen_write_sleep(reset_delay_ms);
+		acpigen_disable_tx_gpio(params->reset_gpio);
+		if (params->reset_delay_ms)
+			acpigen_write_sleep(params->reset_delay_ms);
 	}
 	if (stop_gpio) {
-		acpigen_disable_tx_gpio(stop);
-		if (stop_delay_ms)
-			acpigen_write_sleep(stop_delay_ms);
+		acpigen_disable_tx_gpio(params->stop_gpio);
+		if (params->stop_delay_ms)
+			acpigen_write_sleep(params->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)
-		acpigen_disable_tx_gpio(enable);
+	if (stop_gpio) {
+		acpigen_enable_tx_gpio(params->stop_gpio);
+		if (params->stop_off_delay_ms)
+			acpigen_write_sleep(params->stop_off_delay_ms);
+	}
+	if (reset_gpio) {
+		acpigen_enable_tx_gpio(params->reset_gpio);
+		if (params->reset_off_delay_ms)
+			acpigen_write_sleep(params->reset_off_delay_ms);
+	}
+	if (enable_gpio) {
+		acpigen_disable_tx_gpio(params->enable_gpio);
+		if (params->enable_off_delay_ms)
+			acpigen_write_sleep(params->enable_off_delay_ms);
+	}
 	acpigen_pop_len();		/* _OFF method */
 
 	acpigen_pop_len();		/* PowerResource PRIC */
diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h
index 4361c740c9..33f3f8687d 100644
--- a/src/arch/x86/include/arch/acpi_device.h
+++ b/src/arch/x86/include/arch/acpi_device.h
@@ -315,6 +315,40 @@ struct acpi_spi {
 /* Write SPI Bus descriptor to SSDT AML output */
 void acpi_device_write_spi(const struct acpi_spi *spi);
 
+/* GPIO/timing information for the power on/off sequences */
+struct acpi_power_res_params {
+	/* GPIO used to take device out of reset or to put it into reset. */
+	struct acpi_gpio *reset_gpio;
+	/* Delay to be inserted after device is taken out of reset.
+	 * (_ON method delay)
+	 */
+	unsigned int reset_delay_ms;
+	/* Delay to be inserted after device is put into reset.
+	 * (_OFF method delay)
+	 */
+	unsigned int reset_off_delay_ms;
+	/* GPIO used to enable device. */
+	struct acpi_gpio *enable_gpio;
+	/* Delay to be inserted after device is enabled.
+	 * (_ON method delay)
+	 */
+	unsigned int enable_delay_ms;
+	/* Delay to be inserted after device is disabled.
+	 * (_OFF method delay)
+	 */
+	unsigned int enable_off_delay_ms;
+	/* GPIO used to stop operation of device. */
+	struct acpi_gpio *stop_gpio;
+	/* Delay to be inserted after disabling stop.
+	 * (_ON method delay)
+	 */
+	unsigned int stop_delay_ms;
+	/* Delay to be inserted after enabling stop.
+	 * (_OFF method delay)
+	 */
+	unsigned int stop_off_delay_ms;
+};
+
 /*
  * Add a basic PowerResource block for a device that includes
  * GPIOs to control enable, reset and stop operation of the device. Each
@@ -324,10 +358,7 @@ void acpi_device_write_spi(const struct acpi_spi *spi);
  * 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 *stop, unsigned int stop_delay_ms);
+void acpi_device_add_power_res(const struct acpi_power_res_params *params);
 
 /*
  * Writing Device Properties objects via _DSD