mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

spi/bcm63xx-hsspi: fix pm sleep support

Browse source 
Use the right CONFIG symbol to guard, properly (un)preprare clocks on
suspend/resume, and check the result of it.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Jonas Gorski 2013-12-17 21:44:48 +01:00 committed by Mark Brown
parent 7d25569580
commit 937ebf9cd3
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/spi/spi-bcm63xx-hsspi.c
View file

@ -425,14 +425,14 @@ static int bcm63xx_hsspi_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int bcm63xx_hsspi_suspend(struct device *dev) static int bcm63xx_hsspi_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);
struct bcm63xx_hsspi *bs = spi_master_get_devdata(master); struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
spi_master_suspend(master); spi_master_suspend(master);
clk_disable(bs->clk); clk_disable_unprepare(bs->clk);
return 0; return 0;
} }
@ -441,30 +441,27 @@ static int bcm63xx_hsspi_resume(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);
struct bcm63xx_hsspi *bs = spi_master_get_devdata(master); struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
int ret;
ret = clk_prepare_enable(bs->clk);
if (ret)
return ret;
clk_enable(bs->clk);
spi_master_resume(master); spi_master_resume(master);
return 0; return 0;
} }
static const struct dev_pm_ops bcm63xx_hsspi_pm_ops = {
.suspend = bcm63xx_hsspi_suspend,
.resume = bcm63xx_hsspi_resume,
};
#define BCM63XX_HSSPI_PM_OPS (&bcm63xx_hsspi_pm_ops)
#else
#define BCM63XX_HSSPI_PM_OPS NULL
#endif #endif
static const struct dev_pm_ops bcm63xx_hsspi_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_hsspi_suspend, bcm63xx_hsspi_resume)
};
static struct platform_driver bcm63xx_hsspi_driver = { static struct platform_driver bcm63xx_hsspi_driver = {
.driver = { .driver = {
.name = "bcm63xx-hsspi", .name = "bcm63xx-hsspi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = BCM63XX_HSSPI_PM_OPS, .pm = &bcm63xx_hsspi_pm_ops,
}, },
.probe = bcm63xx_hsspi_probe, .probe = bcm63xx_hsspi_probe,
.remove = bcm63xx_hsspi_remove, .remove = bcm63xx_hsspi_remove,