diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-23 14:02:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-23 14:02:21 +0100 |
| commit | 32111abb508424d1d110fa471d940160abe251f5 (patch) | |
| tree | b44ace0e8ddfd249643cbe4b2c38e89238921fb7 /drivers | |
| parent | b4482afeb7e91dabd8a2d6570a1b216eb34408a6 (diff) | |
| parent | 213d27a42ce1646989966011d2af8563feac5635 (diff) | |
Merge tag 'spi-linus' into spi-next
spi: Fixes for v3.7
A bunch of fixes here, mostly minor except for the pl022 which has just
been a bit of a shambles all round, the recent runtime PM changes have
as far as I can tell never worked so they're just getting thrown out.
Conflicts:
drivers/spi/spi-pl022.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-pl022.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 0205d470fde6..1361868fced7 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2192,9 +2192,6 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", adev->res.start, pl022->virtbase); - pm_runtime_enable(dev); - pm_runtime_resume(dev); - pl022->clk = devm_clk_get(&adev->dev, NULL); if (IS_ERR(pl022->clk)) { status = PTR_ERR(pl022->clk); @@ -2298,7 +2295,6 @@ pl022_remove(struct amba_device *adev) clk_disable(pl022->clk); clk_unprepare(pl022->clk); - pm_runtime_disable(&adev->dev); amba_release_regions(adev); tasklet_disable(&pl022->pump_transfers); spi_unregister_master(pl022->master); |