aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx25/devices.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-11 05:35:33 -0500
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-17 04:01:39 -0500
commitab9cee4b2167f8bf01d85b537df5b9cbe342c780 (patch)
treedb37c9d9263e1a2aea6c3c6b08b904c0163e905e /arch/arm/mach-mx25/devices.c
parentd485c7e71675abdd6133128e596b41284c2ee7b5 (diff)
ARM: mx25: dynamically allocate imx-keypad devices
The mxc-keypad device seems to be the result of an early and partial merge of the keypad driver. It's unused and there is no corresponding driver available, so just remove it. Cc: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx25/devices.c')
-rw-r--r--arch/arm/mach-mx25/devices.c39
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/arm/mach-mx25/devices.c b/arch/arm/mach-mx25/devices.c
index 1798be90a382..052adbbb3de6 100644
--- a/arch/arm/mach-mx25/devices.c
+++ b/arch/arm/mach-mx25/devices.c
@@ -22,25 +22,6 @@
22#include <mach/mx25.h> 22#include <mach/mx25.h>
23#include <mach/irqs.h> 23#include <mach/irqs.h>
24 24
25static struct resource mxc_keypad_resources[] = {
26 {
27 .start = 0x43fa8000,
28 .end = 0x43fabfff,
29 .flags = IORESOURCE_MEM,
30 }, {
31 .start = 24,
32 .end = 24,
33 .flags = IORESOURCE_IRQ,
34 }
35};
36
37struct platform_device mxc_keypad_device = {
38 .name = "mxc-keypad",
39 .id = -1,
40 .num_resources = ARRAY_SIZE(mxc_keypad_resources),
41 .resource = mxc_keypad_resources,
42};
43
44static struct resource mx25_rtc_resources[] = { 25static struct resource mx25_rtc_resources[] = {
45 { 26 {
46 .start = MX25_DRYICE_BASE_ADDR, 27 .start = MX25_DRYICE_BASE_ADDR,
@@ -98,26 +79,6 @@ struct platform_device mxc_wdt = {
98 .resource = mxc_wdt_resources, 79 .resource = mxc_wdt_resources,
99}; 80};
100 81
101static struct resource mx25_kpp_resources[] = {
102 {
103 .start = MX25_KPP_BASE_ADDR,
104 .end = MX25_KPP_BASE_ADDR + 0xf,
105 .flags = IORESOURCE_MEM,
106 },
107 {
108 .start = MX25_INT_KPP,
109 .end = MX25_INT_KPP,
110 .flags = IORESOURCE_IRQ,
111 },
112};
113
114struct platform_device mx25_kpp_device = {
115 .name = "imx-keypad",
116 .id = -1,
117 .num_resources = ARRAY_SIZE(mx25_kpp_resources),
118 .resource = mx25_kpp_resources,
119};
120
121static struct resource mx25_csi_resources[] = { 82static struct resource mx25_csi_resources[] = {
122 { 83 {
123 .start = MX25_CSI_BASE_ADDR, 84 .start = MX25_CSI_BASE_ADDR,