Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
OMAP: cs should be positive in gpmc_cs_free()
omap: fix unlikely(x) < y
omap3: clock: Fixed dpll3_m2x2 rate calculation
omap3: clock: Fix the DPLL freqsel computations
omap: Fix keymap for zoom2 according to matrix keypad framwork
+43
-44
arch/arm/mach-omap2/board-zoom2.c
+43
-44
arch/arm/mach-omap2/board-zoom2.c
···
30
30
/* Zoom2 has Qwerty keyboard*/
31
31
static int board_keymap[] = {
32
32
KEY(0, 0, KEY_E),
33
-
KEY(1, 0, KEY_R),
34
-
KEY(2, 0, KEY_T),
35
-
KEY(3, 0, KEY_HOME),
36
-
KEY(6, 0, KEY_I),
37
-
KEY(7, 0, KEY_LEFTSHIFT),
38
-
KEY(0, 1, KEY_D),
33
+
KEY(0, 1, KEY_R),
34
+
KEY(0, 2, KEY_T),
35
+
KEY(0, 3, KEY_HOME),
36
+
KEY(0, 6, KEY_I),
37
+
KEY(0, 7, KEY_LEFTSHIFT),
38
+
KEY(1, 0, KEY_D),
39
39
KEY(1, 1, KEY_F),
40
-
KEY(2, 1, KEY_G),
41
-
KEY(3, 1, KEY_SEND),
42
-
KEY(6, 1, KEY_K),
43
-
KEY(7, 1, KEY_ENTER),
44
-
KEY(0, 2, KEY_X),
45
-
KEY(1, 2, KEY_C),
40
+
KEY(1, 2, KEY_G),
41
+
KEY(1, 3, KEY_SEND),
42
+
KEY(1, 6, KEY_K),
43
+
KEY(1, 7, KEY_ENTER),
44
+
KEY(2, 0, KEY_X),
45
+
KEY(2, 1, KEY_C),
46
46
KEY(2, 2, KEY_V),
47
-
KEY(3, 2, KEY_END),
48
-
KEY(6, 2, KEY_DOT),
49
-
KEY(7, 2, KEY_CAPSLOCK),
50
-
KEY(0, 3, KEY_Z),
51
-
KEY(1, 3, KEY_KPPLUS),
52
-
KEY(2, 3, KEY_B),
47
+
KEY(2, 3, KEY_END),
48
+
KEY(2, 6, KEY_DOT),
49
+
KEY(2, 7, KEY_CAPSLOCK),
50
+
KEY(3, 0, KEY_Z),
51
+
KEY(3, 1, KEY_KPPLUS),
52
+
KEY(3, 2, KEY_B),
53
53
KEY(3, 3, KEY_F1),
54
-
KEY(6, 3, KEY_O),
55
-
KEY(7, 3, KEY_SPACE),
56
-
KEY(0, 4, KEY_W),
57
-
KEY(1, 4, KEY_Y),
58
-
KEY(2, 4, KEY_U),
59
-
KEY(3, 4, KEY_F2),
54
+
KEY(3, 6, KEY_O),
55
+
KEY(3, 7, KEY_SPACE),
56
+
KEY(4, 0, KEY_W),
57
+
KEY(4, 1, KEY_Y),
58
+
KEY(4, 2, KEY_U),
59
+
KEY(4, 3, KEY_F2),
60
60
KEY(4, 4, KEY_VOLUMEUP),
61
-
KEY(6, 4, KEY_L),
62
-
KEY(7, 4, KEY_LEFT),
63
-
KEY(0, 5, KEY_S),
64
-
KEY(1, 5, KEY_H),
65
-
KEY(2, 5, KEY_J),
66
-
KEY(3, 5, KEY_F3),
61
+
KEY(4, 6, KEY_L),
62
+
KEY(4, 7, KEY_LEFT),
63
+
KEY(5, 0, KEY_S),
64
+
KEY(5, 1, KEY_H),
65
+
KEY(5, 2, KEY_J),
66
+
KEY(5, 3, KEY_F3),
67
67
KEY(5, 5, KEY_VOLUMEDOWN),
68
-
KEY(6, 5, KEY_M),
69
-
KEY(4, 5, KEY_ENTER),
70
-
KEY(7, 5, KEY_RIGHT),
71
-
KEY(0, 6, KEY_Q),
72
-
KEY(1, 6, KEY_A),
73
-
KEY(2, 6, KEY_N),
74
-
KEY(3, 6, KEY_BACKSPACE),
68
+
KEY(5, 6, KEY_M),
69
+
KEY(5, 7, KEY_ENTER),
70
+
KEY(6, 0, KEY_Q),
71
+
KEY(6, 1, KEY_A),
72
+
KEY(6, 2, KEY_N),
73
+
KEY(6, 3, KEY_BACKSPACE),
75
74
KEY(6, 6, KEY_P),
76
-
KEY(7, 6, KEY_UP),
77
75
KEY(6, 7, KEY_SELECT),
78
-
KEY(7, 7, KEY_DOWN),
79
-
KEY(0, 7, KEY_PROG1), /*MACRO 1 <User defined> */
80
-
KEY(1, 7, KEY_PROG2), /*MACRO 2 <User defined> */
81
-
KEY(2, 7, KEY_PROG3), /*MACRO 3 <User defined> */
82
-
KEY(3, 7, KEY_PROG4), /*MACRO 4 <User defined> */
83
-
0
76
+
KEY(7, 0, KEY_PROG1), /*MACRO 1 <User defined> */
77
+
KEY(7, 1, KEY_PROG2), /*MACRO 2 <User defined> */
78
+
KEY(7, 2, KEY_PROG3), /*MACRO 3 <User defined> */
79
+
KEY(7, 3, KEY_PROG4), /*MACRO 4 <User defined> */
80
+
KEY(7, 5, KEY_RIGHT),
81
+
KEY(7, 6, KEY_UP),
82
+
KEY(7, 7, KEY_DOWN)
84
83
};
85
84
86
85
static struct matrix_keymap_data board_map_data = {
+1
-1
arch/arm/mach-omap2/clock34xx.c
+1
-1
arch/arm/mach-omap2/clock34xx.c
+2
-2
arch/arm/mach-omap2/clock34xx.h
+2
-2
arch/arm/mach-omap2/clock34xx.h
···
489
489
static struct clk dpll3_m2x2_ck = {
490
490
.name = "dpll3_m2x2_ck",
491
491
.ops = &clkops_null,
492
-
.parent = &dpll3_x2_ck,
492
+
.parent = &dpll3_m2_ck,
493
493
.clkdm_name = "dpll3_clkdm",
494
-
.recalc = &followparent_recalc,
494
+
.recalc = &omap3_clkoutx2_recalc,
495
495
};
496
496
497
497
/* The PWRDN bit is apparently only available on 3430ES2 and above */
+1
-1
arch/arm/mach-omap2/gpmc.c
+1
-1
arch/arm/mach-omap2/gpmc.c
···
378
378
void gpmc_cs_free(int cs)
379
379
{
380
380
spin_lock(&gpmc_mem_lock);
381
-
if (cs >= GPMC_CS_NUM || !gpmc_cs_reserved(cs)) {
381
+
if (cs >= GPMC_CS_NUM || cs < 0 || !gpmc_cs_reserved(cs)) {
382
382
printk(KERN_ERR "Trying to free non-reserved GPMC CS%d\n", cs);
383
383
BUG();
384
384
spin_unlock(&gpmc_mem_lock);