projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3ad909b
)
ARM: 7589/1: integrator: pass the lm resource to amba
author
Linus Walleij
<linus.walleij@linaro.org>
Fri, 30 Nov 2012 15:31:13 +0000
(16:31 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 3 Dec 2012 11:15:36 +0000
(11:15 +0000)
This passes the lm resource to register the AMBA devices on the
LM as contained within the LM resource.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-integrator/impd1.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-integrator/impd1.c
b/arch/arm/mach-integrator/impd1.c
index e428f3ab15c75519e3aa7a3ceda3728228d1831e..5973109fb874b8680c1921fad148bfba89674d3c 100644
(file)
--- a/
arch/arm/mach-integrator/impd1.c
+++ b/
arch/arm/mach-integrator/impd1.c
@@
-402,9
+402,10
@@
static int impd1_probe(struct lm_device *dev)
pc_base = dev->resource.start + idev->offset;
snprintf(devname, 32, "lm%x:%5.5lx", dev->id, idev->offset >> 12);
- d = amba_ahb_device_add(&dev->dev, devname, pc_base, SZ_4K,
- dev->irq, dev->irq,
- idev->platform_data, idev->id);
+ d = amba_ahb_device_add_res(&dev->dev, devname, pc_base, SZ_4K,
+ dev->irq, dev->irq,
+ idev->platform_data, idev->id,
+ &dev->resource);
if (IS_ERR(d)) {
dev_err(&dev->dev, "unable to register device: %ld\n", PTR_ERR(d));
continue;