aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-08-22 07:10:48 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-09-26 05:07:50 -0400
commit28633c54bda633b18544c602fc94961a3999a361 (patch)
treede315b459b3eb11e13d397e4e68b03f538c0a2db
parent8b0dd112197a132b55b9ed3cc023b0c494f3f5dc (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>
-rw-r--r--arch/arm/mach-ux500/devices-db8500.c20
-rw-r--r--arch/arm/mach-ux500/devices-db8500.h15
-rw-r--r--arch/arm/mach-ux500/devices.h1
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 bc316062e0c2..b612751ea75c 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 = {
57 .resource = dma40_resources 57 .resource = dma40_resources
58}; 58};
59 59
60struct resource keypad_resources[] = {
61 [0] = {
62 .start = U8500_SKE_BASE,
63 .end = U8500_SKE_BASE + SZ_4K - 1,
64 .flags = IORESOURCE_MEM,
65 },
66 [1] = {
67 .start = IRQ_DB8500_KB,
68 .end = IRQ_DB8500_KB,
69 .flags = IORESOURCE_IRQ,
70 },
71};
72
73struct platform_device u8500_ske_keypad_device = {
74 .name = "nmk-ske-keypad",
75 .id = -1,
76 .num_resources = ARRAY_SIZE(keypad_resources),
77 .resource = keypad_resources,
78};
79
80struct prcmu_pdata db8500_prcmu_pdata = { 60struct prcmu_pdata db8500_prcmu_pdata = {
81 .ab_platdata = &ab8500_platdata, 61 .ab_platdata = &ab8500_platdata,
82 .ab_irq = IRQ_DB8500_AB8500, 62 .ab_irq = IRQ_DB8500_AB8500,
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
index e47039b9748f..be1d538e8109 100644
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ b/arch/arm/mach-ux500/devices-db8500.h
@@ -13,7 +13,6 @@
13#include "db8500-regs.h" 13#include "db8500-regs.h"
14#include "devices-common.h" 14#include "devices-common.h"
15 15
16struct ske_keypad_platform_data;
17struct pl022_ssp_controller; 16struct pl022_ssp_controller;
18struct platform_device; 17struct platform_device;
19 18
@@ -21,20 +20,6 @@ extern struct ab8500_platform_data ab8500_platdata;
21extern struct prcmu_pdata db8500_prcmu_pdata; 20extern struct prcmu_pdata db8500_prcmu_pdata;
22extern struct platform_device db8500_prcmu_device; 21extern struct platform_device db8500_prcmu_device;
23 22
24static inline struct platform_device *
25db8500_add_ske_keypad(struct device *parent,
26 struct ske_keypad_platform_data *pdata,
27 size_t size)
28{
29 struct resource resources[] = {
30 DEFINE_RES_MEM(U8500_SKE_BASE, SZ_4K),
31 DEFINE_RES_IRQ(IRQ_DB8500_KB),
32 };
33
34 return platform_device_register_resndata(parent, "nmk-ske-keypad", -1,
35 resources, 2, pdata, size);
36}
37
38static inline struct amba_device * 23static inline struct amba_device *
39db8500_add_ssp(struct device *parent, const char *name, resource_size_t base, 24db8500_add_ssp(struct device *parent, const char *name, resource_size_t base,
40 int irq, struct pl022_ssp_controller *pdata) 25 int irq, struct pl022_ssp_controller *pdata)
diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h
index 9b5eb69a0154..eafb07a5597a 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[];
15extern struct amba_device ux500_pl031_device; 15extern struct amba_device ux500_pl031_device;
16 16
17extern struct platform_device u8500_dma40_device; 17extern struct platform_device u8500_dma40_device;
18extern struct platform_device ux500_ske_keypad_device;
19 18
20#endif 19#endif