From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 30 Nov 2012 15:31:13 +0000 (+0100)
Subject: ARM: 7589/1: integrator: pass the lm resource to amba
X-Git-Tag: v3.8-rc1~147^2~1^4~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2148b93ac86665ee70aea684bac003b3deb31dde;p=platform%2Fkernel%2Flinux-exynos.git

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>
---

diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index e428f3a..5973109 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;