@@ -246,6 +246,9 @@ static int spi_drv_probe(struct device *dev)
/* Make sure that the master is powered on */
pm_runtime_get_sync(&spi->master->dev);
+ if (ACPI_HANDLE(&spi->dev))
+ acpi_dev_pm_attach(&spi->dev, true);
+
/*
* Enable runtime PM for the SPI device. The SPI device driver can
* participate in runtime PM by calling pm_runtime_put() in its
@@ -260,6 +263,9 @@ static int spi_drv_probe(struct device *dev)
pm_runtime_disable(&spi->dev);
pm_runtime_set_suspended(&spi->dev);
pm_runtime_put_noidle(&spi->dev);
+
+ if (ACPI_HANDLE(&spi->dev))
+ acpi_dev_pm_detach(&spi->dev, true);
}
pm_runtime_put(&spi->master->dev);
@@ -282,6 +288,9 @@ static int spi_drv_remove(struct device *dev)
pm_runtime_set_suspended(&spi->dev);
pm_runtime_put_noidle(&spi->dev);
+ if (ACPI_HANDLE(&spi->dev))
+ acpi_dev_pm_detach(&spi->dev, true);
+
pm_runtime_put(&spi->master->dev);
return ret;
If the SPI device is enumerated from ACPI namespace (it has an ACPI handle) it might have ACPI methods that needs to be called in order to transition the device to different power states (such as _PSx). We follow what has been done for platform and I2C buses here and attach the SPI device to the ACPI power domain if the device has an ACPI handle. This makes sure that the device is powered on when its ->probe() is called. For non-ACPI devices this patch is a no-op. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> --- drivers/spi/spi.c | 9 +++++++++ 1 file changed, 9 insertions(+)