ARM: 7372/1: ux500: factor out dynamic amba device allocator

This replaces the dynamic device allocator in the ux500 machine
with the common device allocator in the bus code.

Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 0 insertions, 33 deletions

diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c
index c5312a4b49f5..dfdd4a54668d 100644
--- a/arch/arm/mach-ux500/devices-common.c
+++ b/arch/arm/mach-ux500/devices-common.c
@@ -11,7 +11,6 @@
 #include <linux/irq.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
-#include <linux/amba/bus.h>
 
 #include <plat/gpio-nomadik.h>
 
@@ -19,38 +18,6 @@
 
 #include "devices-common.h"
 
-struct amba_device *
-dbx500_add_amba_device(struct device *parent, const char *name,
-                       resource_size_t base, int irq, void *pdata,
-                       unsigned int periphid)
-{
-        struct amba_device *dev;
-        int ret;
-
-        dev = amba_device_alloc(name, base, SZ_4K);
-        if (!dev)
-                return ERR_PTR(-ENOMEM);
-
-        dev->dma_mask = DMA_BIT_MASK(32);
-        dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
-
-        dev->irq[0] = irq;
-
-        dev->periphid = periphid;
-
-        dev->dev.platform_data = pdata;
-
-        dev->dev.parent = parent;
-
-        ret = amba_device_add(dev, &iomem_resource);
-        if (ret) {
-                amba_device_put(dev);
-                return ERR_PTR(ret);
-        }
-
-        return dev;
-}
-
 static struct platform_device *
 dbx500_add_gpio(struct device *parent, int id, resource_size_t addr, int irq,
                 struct nmk_gpio_platform_data *pdata)