Commit 7e0ae740 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'spi/topic/pl022' into spi-next

parents 3135ba82 2c067509
...@@ -2173,7 +2173,7 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -2173,7 +2173,7 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
status = -ENOMEM; status = -ENOMEM;
goto err_no_ioremap; goto err_no_ioremap;
} }
printk(KERN_INFO "pl022: mapped registers from %pa to %p\n", dev_info(&adev->dev, "mapped registers from %pa to %p\n",
&adev->res.start, pl022->virtbase); &adev->res.start, pl022->virtbase);
pl022->clk = devm_clk_get(&adev->dev, NULL); pl022->clk = devm_clk_get(&adev->dev, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment