aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/devices-common.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-ux500/devices-common.c')
-rw-r--r--arch/arm/mach-ux500/devices-common.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c
index 96be2482ea45..96effbd8ceb5 100644
--- a/arch/arm/mach-ux500/devices-common.c
+++ b/arch/arm/mach-ux500/devices-common.c
@@ -47,6 +47,8 @@ dbx500_add_amba_device(struct device *parent, const char *name,
47 47
48 dev->dev.platform_data = pdata; 48 dev->dev.platform_data = pdata;
49 49
50 dev->dev.parent = parent;
51
50 ret = amba_device_register(dev, &iomem_resource); 52 ret = amba_device_register(dev, &iomem_resource);
51 if (ret) { 53 if (ret) {
52 kfree(dev); 54 kfree(dev);
@@ -126,9 +128,14 @@ dbx500_add_gpio(struct device *parent, int id, resource_size_t addr, int irq,
126 } 128 }
127 }; 129 };
128 130
129 return platform_device_register_resndata(NULL, "gpio", id, 131 return platform_device_register_resndata(
130 resources, ARRAY_SIZE(resources), 132 parent,
131 pdata, sizeof(*pdata)); 133 "gpio",
134 id,
135 resources,
136 ARRAY_SIZE(resources),
137 pdata,
138 sizeof(*pdata));
132} 139}
133 140
134void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num, 141void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,