summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/devices-db8500.h
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-02-06 11:22:26 -0800
committerArnd Bergmann <arnd@arndb.de>2012-02-13 06:31:53 +0000
commit3510ec672319e09fe43bd623b19fcf539c0bd1fa (patch)
tree4c45a1f0d9791c7f9b7427f55df232473dd3ecf9 /arch/arm/mach-ux500/devices-db8500.h
parentb024a0c804356d90b13c072c8bbb444d9e745a66 (diff)
downloadop-kernel-dev-3510ec672319e09fe43bd623b19fcf539c0bd1fa.zip
op-kernel-dev-3510ec672319e09fe43bd623b19fcf539c0bd1fa.tar.gz
ARM: ux500: remove intermediary add_platform_device* functions
These are no longer required since a 'parent' pointer is now passed to each registering device. Signed-off-by: Lee Jones <lee.jones@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500/devices-db8500.h')
-rw-r--r--arch/arm/mach-ux500/devices-db8500.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
index 9bd08ad..9fd93e9 100644
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ b/arch/arm/mach-ux500/devices-db8500.h
@@ -18,9 +18,13 @@ db8500_add_ske_keypad(struct device *parent,
struct ske_keypad_platform_data *pdata,
size_t size)
{
- return dbx500_add_platform_device_4k1irq("nmk-ske-keypad", -1,
- U8500_SKE_BASE,
- IRQ_DB8500_KB, pdata);
+ struct resource resources[] = {
+ DEFINE_RES_MEM(U8500_SKE_BASE, SZ_4K),
+ DEFINE_RES_IRQ(IRQ_DB8500_KB),
+ };
+
+ return platform_device_register_resndata(parent, "nmk-ske-keypad", -1,
+ resources, 2, pdata, size);
}
static inline struct amba_device *
OpenPOWER on IntegriCloud