From daf3a1b2f335870d23686cde36ecab3ad08ad99a Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Thu, 22 Mar 2012 15:47:54 +0800 Subject: [PATCH] Keep SPI power on during booting BZ: 25894 if SPI UART is set as default console and earlyprintk is enabled, it cannot shutdown SPI controller during booting. Change-Id: If8d305cbc276ce26fe0f15ad5265e859b24388ad Signed-off-by: Bin Yang Reviewed-on: http://android.intel.com:8080/40121 Reviewed-by: Du, Alek Tested-by: Wang, Zhifeng Reviewed-by: buildbot Tested-by: buildbot --- drivers/spi/dw_spi_pci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/spi/dw_spi_pci.c b/drivers/spi/dw_spi_pci.c index 7d7fffb..138d9d6 100644 --- a/drivers/spi/dw_spi_pci.c +++ b/drivers/spi/dw_spi_pci.c @@ -182,8 +182,13 @@ static int spi_dw_pci_runtime_idle(struct device *dev) int err; dev_dbg(dev, "pci_runtime_idle called\n"); - - err = pm_schedule_suspend(dev, 500); + if (system_state == SYSTEM_BOOTING) + /* if SPI UART is set as default console and earlyprintk + * is enabled, it cannot shutdown SPI controller during booting. + */ + err = pm_schedule_suspend(dev, 30000); + else + err = pm_schedule_suspend(dev, 500); if (err != 0) return 0; return -EBUSY; -- 2.7.4