releases/3.4.75/arm-pxa-tosa-fix-keys-mapping.patch

   1 From 506cac15ac86f204b83e3cfccde73eeb4e7c5f34 Mon Sep 17 00:00:00 2001
   2 From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
   3 Date: Sat, 16 Nov 2013 16:47:50 +0400
   4 Subject: ARM: pxa: tosa: fix keys mapping
   5
   6 From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
   7
   8 commit 506cac15ac86f204b83e3cfccde73eeb4e7c5f34 upstream.
   9
  10 When converting from tosa-keyboard driver to matrix keyboard, tosa keys
  11 received extra 1 column shift. Replace that with correct values to make
  12 keyboard work again.
  13
  14 Fixes: f69a6548c9d5 ('[ARM] pxa/tosa: make use of the matrix keypad driver')
  15 Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  16 Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
  17 Signed-off-by: Olof Johansson <olof@lixom.net>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19
  20 ---
  21  arch/arm/mach-pxa/tosa.c |  102 +++++++++++++++++++++++------------------------
  22  1 file changed, 51 insertions(+), 51 deletions(-)
  23
  24 --- a/arch/arm/mach-pxa/tosa.c
  25 +++ b/arch/arm/mach-pxa/tosa.c
  26 @@ -424,57 +424,57 @@ static struct platform_device tosa_power
  27   * Tosa Keyboard
  28   */
  29  static const uint32_t tosakbd_keymap[] = {
  30 -       KEY(0, 2, KEY_W),
  31 -       KEY(0, 6, KEY_K),
  32 -       KEY(0, 7, KEY_BACKSPACE),
  33 -       KEY(0, 8, KEY_P),
  34 -       KEY(1, 1, KEY_Q),
  35 -       KEY(1, 2, KEY_E),
  36 -       KEY(1, 3, KEY_T),
  37 -       KEY(1, 4, KEY_Y),
  38 -       KEY(1, 6, KEY_O),
  39 -       KEY(1, 7, KEY_I),
  40 -       KEY(1, 8, KEY_COMMA),
  41 -       KEY(2, 1, KEY_A),
  42 -       KEY(2, 2, KEY_D),
  43 -       KEY(2, 3, KEY_G),
  44 -       KEY(2, 4, KEY_U),
  45 -       KEY(2, 6, KEY_L),
  46 -       KEY(2, 7, KEY_ENTER),
  47 -       KEY(2, 8, KEY_DOT),
  48 -       KEY(3, 1, KEY_Z),
  49 -       KEY(3, 2, KEY_C),
  50 -       KEY(3, 3, KEY_V),
  51 -       KEY(3, 4, KEY_J),
  52 -       KEY(3, 5, TOSA_KEY_ADDRESSBOOK),
  53 -       KEY(3, 6, TOSA_KEY_CANCEL),
  54 -       KEY(3, 7, TOSA_KEY_CENTER),
  55 -       KEY(3, 8, TOSA_KEY_OK),
  56 -       KEY(3, 9, KEY_LEFTSHIFT),
  57 -       KEY(4, 1, KEY_S),
  58 -       KEY(4, 2, KEY_R),
  59 -       KEY(4, 3, KEY_B),
  60 -       KEY(4, 4, KEY_N),
  61 -       KEY(4, 5, TOSA_KEY_CALENDAR),
  62 -       KEY(4, 6, TOSA_KEY_HOMEPAGE),
  63 -       KEY(4, 7, KEY_LEFTCTRL),
  64 -       KEY(4, 8, TOSA_KEY_LIGHT),
  65 -       KEY(4, 10, KEY_RIGHTSHIFT),
  66 -       KEY(5, 1, KEY_TAB),
  67 -       KEY(5, 2, KEY_SLASH),
  68 -       KEY(5, 3, KEY_H),
  69 -       KEY(5, 4, KEY_M),
  70 -       KEY(5, 5, TOSA_KEY_MENU),
  71 -       KEY(5, 7, KEY_UP),
  72 -       KEY(5, 11, TOSA_KEY_FN),
  73 -       KEY(6, 1, KEY_X),
  74 -       KEY(6, 2, KEY_F),
  75 -       KEY(6, 3, KEY_SPACE),
  76 -       KEY(6, 4, KEY_APOSTROPHE),
  77 -       KEY(6, 5, TOSA_KEY_MAIL),
  78 -       KEY(6, 6, KEY_LEFT),
  79 -       KEY(6, 7, KEY_DOWN),
  80 -       KEY(6, 8, KEY_RIGHT),
  81 +       KEY(0, 1, KEY_W),
  82 +       KEY(0, 5, KEY_K),
  83 +       KEY(0, 6, KEY_BACKSPACE),
  84 +       KEY(0, 7, KEY_P),
  85 +       KEY(1, 0, KEY_Q),
  86 +       KEY(1, 1, KEY_E),
  87 +       KEY(1, 2, KEY_T),
  88 +       KEY(1, 3, KEY_Y),
  89 +       KEY(1, 5, KEY_O),
  90 +       KEY(1, 6, KEY_I),
  91 +       KEY(1, 7, KEY_COMMA),
  92 +       KEY(2, 0, KEY_A),
  93 +       KEY(2, 1, KEY_D),
  94 +       KEY(2, 2, KEY_G),
  95 +       KEY(2, 3, KEY_U),
  96 +       KEY(2, 5, KEY_L),
  97 +       KEY(2, 6, KEY_ENTER),
  98 +       KEY(2, 7, KEY_DOT),
  99 +       KEY(3, 0, KEY_Z),
 100 +       KEY(3, 1, KEY_C),
 101 +       KEY(3, 2, KEY_V),
 102 +       KEY(3, 3, KEY_J),
 103 +       KEY(3, 4, TOSA_KEY_ADDRESSBOOK),
 104 +       KEY(3, 5, TOSA_KEY_CANCEL),
 105 +       KEY(3, 6, TOSA_KEY_CENTER),
 106 +       KEY(3, 7, TOSA_KEY_OK),
 107 +       KEY(3, 8, KEY_LEFTSHIFT),
 108 +       KEY(4, 0, KEY_S),
 109 +       KEY(4, 1, KEY_R),
 110 +       KEY(4, 2, KEY_B),
 111 +       KEY(4, 3, KEY_N),
 112 +       KEY(4, 4, TOSA_KEY_CALENDAR),
 113 +       KEY(4, 5, TOSA_KEY_HOMEPAGE),
 114 +       KEY(4, 6, KEY_LEFTCTRL),
 115 +       KEY(4, 7, TOSA_KEY_LIGHT),
 116 +       KEY(4, 9, KEY_RIGHTSHIFT),
 117 +       KEY(5, 0, KEY_TAB),
 118 +       KEY(5, 1, KEY_SLASH),
 119 +       KEY(5, 2, KEY_H),
 120 +       KEY(5, 3, KEY_M),
 121 +       KEY(5, 4, TOSA_KEY_MENU),
 122 +       KEY(5, 6, KEY_UP),
 123 +       KEY(5, 10, TOSA_KEY_FN),
 124 +       KEY(6, 0, KEY_X),
 125 +       KEY(6, 1, KEY_F),
 126 +       KEY(6, 2, KEY_SPACE),
 127 +       KEY(6, 3, KEY_APOSTROPHE),
 128 +       KEY(6, 4, TOSA_KEY_MAIL),
 129 +       KEY(6, 5, KEY_LEFT),
 130 +       KEY(6, 6, KEY_DOWN),
 131 +       KEY(6, 7, KEY_RIGHT),
 132  };
 133
 134  static struct matrix_keymap_data tosakbd_keymap_data = {