1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- linux-2.6.16/arch/arm/mach-pxa/ezx.c~e680-fix-keypad.patch 2006-06-11 00:47:33.000000000 +0200
+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-06-12 16:13:28.000000000 +0200
@@ -341,71 +341,25 @@
};
#endif
-/* keyboard */
-
-#if defined(CONFIG_PXA_EZX_V700)
-#error "kbd matrix still needs to be converted to new row/col layout"
-static unsigned char ezx_keycode[] = {
- /* col 0 */
- KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
- KEYPAD_POUND, KEY_0, KEY_9, 0,
- /* col 1 */
- KEY_2, KEY_4, KEY_6, KEY_8,
- KEY_7, KEYPAD_SLEFT, KEYPAD_SRIGHT, 0,
- /* col 2 */
- KEY_MENU, KEY_1, KEY_3, KEY_5,
- KEY_KPASTERISK, KEY_VOLUMEUP, KEY_VOLUMEDOWN, 0,
- /* col 3 */
- KEY_CAMERA, KEYPAD_CLEAR, KEYPAD_CARRIER, KEYPAD_ACTIVATE,
- KEYPAD_SEND, KEYPAD_SMART, KEYPAD_VAVR, 0,
-};
-static unsigned char ezx_direct_keycode[] = {
- KEYPAD_NONE,
- KEYPAD_NONE,
- KEYPAD_NONE,
- KEYPAD_NONE,
- KEYPAD_NONE,
- KEYPAD_NONE,
-};
-#elif defined(CONFIG_PXA_EZX_E680_P4A)
-#error "kbd matrix still needs to be converted to new row/col layout"
-static unsigned char ezx_keycode[] = {
- /* col 0 */
- KEY_UP, KEY_DOWN, KEY_LEFT, 0, 0, 0, 0, 0,
- /* col 1 */
- KEY_RIGHT, KEY_CENTER, KEY_HOME, 0, 0, 0, 0, 0,
- /* col 2 */
- KEYPAD_GAME_R, 0, KEYPAD_GAME_L, 0, 0, 0, 0, 0,
- /* col 3 */
- KEY_A, KEY_B, 0, 0, 0, 0, 0, 0,
-};
-static unsigned char ezx_direct_keycode[] = {
- KEY_CAMERA,
- KEYPAD_NONE,
- KEYPAD_NONE,
- KEYPAD_NONE,
- KEY_POWER,
- KEYPAD_NONE,
-};
-#elif defined(CONFIG_PXA_EZX_E680)
-#error "kbd matrix still needs to be converted to new row/col layout"
+/*
+ * PXA Keyboard
+ */
+#if defined(CONFIG_PXA_EZX_E680)
static unsigned char ezx_keycode[] = {
- /* col 0 */
- KEY_UP, KEY_DOWN, 0, 0, 0, 0, 0, 0,
- /* col 1 */
- KEY_RIGHT, KEY_LEFT, 0, 0, 0, 0, 0, 0,
- /* col 2 */
- 0, KEYPAD_GAME_R, 0, 0, 0, 0, 0, 0,
- /* col 3 */
- KEYPAD_HOME, KEYPAD_GAME_L, KEYPAD_CENTER, 0, 0, 0, 0, 0,
+ /* row 0 */
+ KEY_UP, KEY_RIGHT, KEY_RESERVED, KEY_PHONE,
+ /* row 1 */
+ KEY_DOWN, KEY_LEFT, KEY_VOLUMEUP, KEY_VOLUMEDOWN,
+ /* row 2 */
+ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_KPENTER,
};
static unsigned char ezx_direct_keycode[] = {
KEY_CAMERA,
- KEYPAD_NONE,
- KEYPAD_NONE,
- KEYPAD_A,
+ KEY_RESERVED,
+ KEY_RESERVED,
+ KEY_HOME,
KEY_POWER,
- KEYPAD_B,
+ KEY_MENU,
};
#elif defined(CONFIG_PXA_EZX_A780)
static unsigned char ezx_keycode[] = {
@@ -424,22 +378,12 @@
KEY_CAMERA,
};
#else
-#error "no EZX subarchitecture defined !?!"
+#error "no EZX subarchitecture defined"
#endif
static int ezx_kbd_init(void)
{
-#if defined(CONFIG_PXA_EZX_E680_P4A)
- pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN); /* KP_DKIN<0>, VR Key */
- pxa_gpio_mode(97 | GPIO_ALT_FN_1_IN); /* KP_DKIN<4>, power key */
- pxa_gpio_mode(100 | GPIO_ALT_FN_1_IN); /* KP_MKIN<0> */
- pxa_gpio_mode(101 | GPIO_ALT_FN_1_IN); /* KP_MKIN<1> */
- pxa_gpio_mode(102 | GPIO_ALT_FN_1_IN); /* KP_MKIN<2> */
- pxa_gpio_mode(103 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<0> */
- pxa_gpio_mode(104 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<1> */
- pxa_gpio_mode(105 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<2> */
- pxa_gpio_mode(106 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<3> */
-#elif defined(CONFIG_PXA_EZX_E680)
+#if defined(CONFIG_PXA_EZX_E680)
pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN); /* KP_DKIN<0>, VR Key */
pxa_gpio_mode(96 | GPIO_ALT_FN_1_IN); /* KP_DKIN<3>, GAME_A */
pxa_gpio_mode(97 | GPIO_ALT_FN_1_IN); /* KP_DKIN<4>, power key */
@@ -455,7 +399,7 @@
GPDR(GPIO_TC_MM_EN) |= GPIO_bit(GPIO_TC_MM_EN);
GPSR(GPIO_TC_MM_EN) = GPIO_bit(GPIO_TC_MM_EN);
PGSR3 |= GPIO_bit(GPIO_TC_MM_EN);
-#elif defined (CONFIG_PXA_EZX_A780)
+#elif defined(CONFIG_PXA_EZX_A780)
pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN); /* KP_DKIN<0>, voice_rec */
pxa_gpio_mode(97 | GPIO_ALT_FN_3_IN); /* KP_MKIN<3> */
pxa_gpio_mode(98 | GPIO_ALT_FN_3_IN); /* KP_MKIN<4> */
@@ -476,10 +420,7 @@
.scan_interval = HZ/40,
.matrix = {
.keycode = &ezx_keycode,
-#if defined(CONFIG_ARCH_EXZ_E680_P4A)
- .cols = 4,
- .rows = 3,
-#elif defined(CONFIG_PXA_EZX_E680)
+#if defined(CONFIG_PXA_EZX_E680)
.cols = 4,
.rows = 3,
#elif defined(CONFIG_PXA_EZX_A780)
@@ -489,10 +430,8 @@
},
.direct = {
.keycode = &ezx_direct_keycode,
-#if defined(CONFIG_PXA_EZX_E680_P4A)
- .num = 4,
-#elif defined(CONFIG_PXA_EZX_E680)
- .num = 5,
+#if defined(CONFIG_PXA_EZX_E680)
+ .num = 6,
#elif defined(CONFIG_PXA_EZX_A780)
.num = 1,
#endif
|
