diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-30 16:31:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-12-03 11:15:36 +0000 |
| commit | 2148b93ac86665ee70aea684bac003b3deb31dde (patch) | |
| tree | c442df89dff87cc38ce65fbb3cdbe54ebeecb16f | |
| parent | 3ad909bc8f2ea32fd7d24266c61cd4605feecec8 (diff) | |
| download | lwn-2148b93ac86665ee70aea684bac003b3deb31dde.tar.gz lwn-2148b93ac86665ee70aea684bac003b3deb31dde.zip | |
ARM: 7589/1: integrator: pass the lm resource to amba
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>
| -rw-r--r-- | arch/arm/mach-integrator/impd1.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index e428f3ab15c7..5973109fb874 100644 --- 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; |