diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-08-22 12:10:48 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 11:07:50 +0200 |
| commit | 28633c54bda633b18544c602fc94961a3999a361 (patch) | |
| tree | de315b459b3eb11e13d397e4e68b03f538c0a2db /arch/arm/mach-ux500 | |
| parent | 8b0dd112197a132b55b9ed3cc023b0c494f3f5dc (diff) | |
ARM: ux500: Rip out keypad initialisation which is no longer used
This is part of the ux500 conversion over to Device Tree only
booting, but this stuff haven't been used for years.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 20 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/devices-db8500.h | 15 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/devices.h | 1 |
3 files changed, 0 insertions, 36 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index bc316062e0c..b612751ea75 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -57,26 +57,6 @@ struct platform_device u8500_dma40_device = { .resource = dma40_resources }; -struct resource keypad_resources[] = { - [0] = { - .start = U8500_SKE_BASE, - .end = U8500_SKE_BASE + SZ_4K - 1, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_DB8500_KB, - .end = IRQ_DB8500_KB, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device u8500_ske_keypad_device = { - .name = "nmk-ske-keypad", - .id = -1, - .num_resources = ARRAY_SIZE(keypad_resources), - .resource = keypad_resources, -}; - struct prcmu_pdata db8500_prcmu_pdata = { .ab_platdata = &ab8500_platdata, .ab_irq = IRQ_DB8500_AB8500, diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index e47039b9748..be1d538e810 100644 --- a/arch/arm/mach-ux500/devices-db8500.h +++ b/arch/arm/mach-ux500/devices-db8500.h @@ -13,7 +13,6 @@ #include "db8500-regs.h" #include "devices-common.h" -struct ske_keypad_platform_data; struct pl022_ssp_controller; struct platform_device; @@ -21,20 +20,6 @@ extern struct ab8500_platform_data ab8500_platdata; extern struct prcmu_pdata db8500_prcmu_pdata; extern struct platform_device db8500_prcmu_device; -static inline struct platform_device * -db8500_add_ske_keypad(struct device *parent, - struct ske_keypad_platform_data *pdata, - size_t size) -{ - 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 * db8500_add_ssp(struct device *parent, const char *name, resource_size_t base, int irq, struct pl022_ssp_controller *pdata) diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h index 9b5eb69a015..eafb07a5597 100644 --- a/arch/arm/mach-ux500/devices.h +++ b/arch/arm/mach-ux500/devices.h @@ -15,6 +15,5 @@ extern struct platform_device u8500_gpio_devs[]; extern struct amba_device ux500_pl031_device; extern struct platform_device u8500_dma40_device; -extern struct platform_device ux500_ske_keypad_device; #endif |