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

Commit 32111abb authored by Mark Brown's avatar Mark Brown
Browse files

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
parents b4482afe 213d27a4

drivers/spi/spi-pl022.c

+0 −4
Original line number Diff line number Diff line
@@ -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);