Merge remote-tracking branch 'spi/topic/pl022' into spi-next
This commit is contained in:
commit
720ed2d130
|
@ -2194,8 +2194,8 @@ 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 0x%08x to %p\n",
|
printk(KERN_INFO "pl022: 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);
|
||||||
if (IS_ERR(pl022->clk)) {
|
if (IS_ERR(pl022->clk)) {
|
||||||
|
|
Loading…
Reference in a new issue