1 files changed, 17 insertions, 62 deletions

diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c
index 898a64517b09..c5312a4b49f5 100644
--- a/arch/arm/mach-ux500/devices-common.c
+++ b/arch/arm/mach-ux500/devices-common.c
@@ -20,8 +20,9 @@
 #include "devices-common.h"
 
 struct amba_device *
-dbx500_add_amba_device(const char *name, resource_size_t base,
-                       int irq, void *pdata, unsigned int periphid)
+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;
@@ -39,6 +40,8 @@ dbx500_add_amba_device(const char *name, resource_size_t base,
 
         dev->dev.platform_data = pdata;
 
+        dev->dev.parent = parent;
+
         ret = amba_device_add(dev, &iomem_resource);
         if (ret) {
                 amba_device_put(dev);
@@ -49,60 +52,7 @@ dbx500_add_amba_device(const char *name, resource_size_t base,
 }
 
 static struct platform_device *
-dbx500_add_platform_device(const char *name, int id, void *pdata,
-                           struct resource *res, int resnum)
-{
-        struct platform_device *dev;
-        int ret;
-
-        dev = platform_device_alloc(name, id);
-        if (!dev)
-                return ERR_PTR(-ENOMEM);
-
-        dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
-        dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
-
-        ret = platform_device_add_resources(dev, res, resnum);
-        if (ret)
-                goto out_free;
-
-        dev->dev.platform_data = pdata;
-
-        ret = platform_device_add(dev);
-        if (ret)
-                goto out_free;
-
-        return dev;
-
-out_free:
-        platform_device_put(dev);
-        return ERR_PTR(ret);
-}
-
-struct platform_device *
-dbx500_add_platform_device_4k1irq(const char *name, int id,
-                                  resource_size_t base,
-                                  int irq, void *pdata)
-{
-        struct resource resources[] = {
-                [0] = {
-                        .start  = base,
-                        .end    = base + SZ_4K - 1,
-                        .flags  = IORESOURCE_MEM,
-                },
-                [1] = {
-                        .start  = irq,
-                        .end    = irq,
-                        .flags  = IORESOURCE_IRQ,
-                }
-        };
-
-        return dbx500_add_platform_device(name, id, pdata, resources,
-                                          ARRAY_SIZE(resources));
-}
-
-static struct platform_device *
-dbx500_add_gpio(int id, resource_size_t addr, int irq,
+dbx500_add_gpio(struct device *parent, int id, resource_size_t addr, int irq,
                 struct nmk_gpio_platform_data *pdata)
 {
         struct resource resources[] = {
@@ -118,13 +68,18 @@ dbx500_add_gpio(int id, resource_size_t addr, int irq,
                 }
         };
 
-        return platform_device_register_resndata(NULL, "gpio", id,
-                                resources, ARRAY_SIZE(resources),
-                                pdata, sizeof(*pdata));
+        return platform_device_register_resndata(
+                parent,
+                "gpio",
+                id,
+                resources,
+                ARRAY_SIZE(resources),
+                pdata,
+                sizeof(*pdata));
 }
 
-void dbx500_add_gpios(resource_size_t *base, int num, int irq,
-                      struct nmk_gpio_platform_data *pdata)
+void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,
+                      int irq, struct nmk_gpio_platform_data *pdata)
 {
         int first = 0;
         int i;
@@ -134,6 +89,6 @@ void dbx500_add_gpios(resource_size_t *base, int num, int irq,
                 pdata->first_irq = NOMADIK_GPIO_TO_IRQ(first);
                 pdata->num_gpio = 32;
 
-                dbx500_add_gpio(i, base[i], irq, pdata);
+                dbx500_add_gpio(parent, i, base[i], irq, pdata);
         }
 }