Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 987c7b94 authored by Luhua Xu's avatar Luhua Xu Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: spi: add power control when set_cs 



As to set_cs takes effect immediately, power spi
is needed when setup spi.

Bug: 167938264
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: default avatarLuhua Xu <luhua.xu@mediatek.com>
Link: https://lore.kernel.org/r/1572426234-30019-1-git-send-email-luhua.xu@mediatek.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
(cherry picked from commit d948e6ca189985495a21cd622c31e30e72b6b688)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I4ed7f854419901f9537916096b941135796956d1
parent 6d9aec4b

drivers/spi/spi.c

+14 −1
Original line number Diff line number Diff line
@@ -3111,7 +3111,20 @@ int spi_setup(struct spi_device *spi) 
	if (spi->controller->setup)

		status = spi->controller->setup(spi);



	if (spi->controller->auto_runtime_pm && spi->controller->set_cs) {

		status = pm_runtime_get_sync(spi->controller->dev.parent);

		if (status < 0) {

			pm_runtime_put_noidle(spi->controller->dev.parent);

			dev_err(&spi->controller->dev, "Failed to power device: %d\n",

				status);

			return status;

		}

		spi_set_cs(spi, false);

		pm_runtime_mark_last_busy(spi->controller->dev.parent);

		pm_runtime_put_autosuspend(spi->controller->dev.parent);

	} else {

		spi_set_cs(spi, false);

	}



	if (spi->rt && !spi->controller->rt) {

		spi->controller->rt = true;