1 files changed, 4 insertions, 45 deletions

diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index a90947f1b4..dea78d5e89 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -26,50 +26,6 @@
 
 #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
 
-static void i2c_generic_add_power_res(struct drivers_i2c_generic_config *config)
-{
-	const char *power_res_dev_states[] = { "_PR0", "_PR3" };
-	unsigned reset_gpio = config->reset_gpio.pins[0];
-	unsigned enable_gpio = config->enable_gpio.pins[0];
-
-	if (!config->has_power_resource)
-		return;
-
-	if (!reset_gpio && !enable_gpio)
-		return;
-
-	/* PowerResource (PRIC, 0, 0) */
-	acpigen_write_power_res("PRIC", 0, 0, power_res_dev_states,
-				ARRAY_SIZE(power_res_dev_states));
-
-	/* Method (_STA, 0, NotSerialized) { Return (0x1) } */
-	acpigen_write_STA(0x1);
-
-	/* Method (_ON, 0, Serialized) */
-	acpigen_write_method_serialized("_ON", 0);
-	if (reset_gpio)
-		acpigen_soc_set_tx_gpio(reset_gpio);
-	if (enable_gpio) {
-		acpigen_soc_set_tx_gpio(enable_gpio);
-		acpigen_write_sleep(config->enable_delay_ms);
-	}
-	if (reset_gpio) {
-		acpigen_soc_clear_tx_gpio(reset_gpio);
-		acpigen_write_sleep(config->reset_delay_ms);
-	}
-	acpigen_pop_len();		/* _ON method */
-
-	/* Method (_OFF, 0, Serialized) */
-	acpigen_write_method_serialized("_OFF", 0);
-	if (reset_gpio)
-		acpigen_soc_set_tx_gpio(reset_gpio);
-	if (enable_gpio)
-		acpigen_soc_clear_tx_gpio(enable_gpio);
-	acpigen_pop_len();		/* _OFF method */
-
-	acpigen_pop_len();		/* PowerResource PRIC */
-}
-
 static bool i2c_generic_add_gpios_to_crs(struct drivers_i2c_generic_config *cfg)
 {
 	/*
@@ -170,7 +126,10 @@ void i2c_generic_fill_ssdt(struct device *dev,
 	}
 
 	/* Power Resource */
-	i2c_generic_add_power_res(config);
+	if (config->has_power_resource)
+		acpi_device_add_power_res(
+			&config->reset_gpio, config->reset_delay_ms,
+			&config->enable_gpio, config->enable_delay_ms);
 
 	/* Callback if any. */
 	if (callback)