diff options
author | Markus Rechberger <mrechberger@gmail.com> | 2005-11-09 00:37:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:18 -0500 |
commit | da45a2a5b96afd7188c058a55eb2917d6524c0cf (patch) | |
tree | 68a71a260242f0e051bad449d08d93f654b0217b | |
parent | 2f4710b1b1c62da3050c4eac08a5f08227e0e0f0 (diff) |
[PATCH] v4l: 783: fixed bad em2820 remote layout values
- Fixed bad em2820 remote layout values
- set KNC One and Purple TV layouts back to default
- added pinnacle ir remote i2c address to the i2c scanner
Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/media/video/em28xx/em28xx-i2c.c | 1 | ||||
-rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 61 |
2 files changed, 31 insertions, 31 deletions
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index b7360d579a8a..a7b6f678f979 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
@@ -499,6 +499,7 @@ static struct i2c_client em2820_client_template = { | |||
499 | static char *i2c_devs[128] = { | 499 | static char *i2c_devs[128] = { |
500 | [0x4a >> 1] = "saa7113h", | 500 | [0x4a >> 1] = "saa7113h", |
501 | [0x60 >> 1] = "remote IR sensor", | 501 | [0x60 >> 1] = "remote IR sensor", |
502 | [0x8e >> 1] = "remote IR sensor", | ||
502 | [0x86 >> 1] = "tda9887", | 503 | [0x86 >> 1] = "tda9887", |
503 | [0x80 >> 1] = "msp34xx", | 504 | [0x80 >> 1] = "msp34xx", |
504 | [0x88 >> 1] = "msp34xx", | 505 | [0x88 >> 1] = "msp34xx", |
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index fbb78b659a8b..aec710f4effc 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c | |||
@@ -43,35 +43,34 @@ | |||
43 | #include <media/ir-common.h> | 43 | #include <media/ir-common.h> |
44 | 44 | ||
45 | static IR_KEYTAB_TYPE ir_codes_em2820[IR_KEYTAB_SIZE] = { | 45 | static IR_KEYTAB_TYPE ir_codes_em2820[IR_KEYTAB_SIZE] = { |
46 | [ 0x00 ] = KEY_CHANNEL, | 46 | [ 0x01 ] = KEY_CHANNEL, |
47 | [ 0x01 ] = KEY_SELECT, | 47 | [ 0x02 ] = KEY_SELECT, |
48 | [ 0x02 ] = KEY_MUTE, | 48 | [ 0x03 ] = KEY_MUTE, |
49 | [ 0x03 ] = KEY_POWER, | 49 | [ 0x04 ] = KEY_POWER, |
50 | [ 0x04 ] = KEY_KP1, | 50 | [ 0x05 ] = KEY_KP1, |
51 | [ 0x05 ] = KEY_KP2, | 51 | [ 0x06 ] = KEY_KP2, |
52 | [ 0x06 ] = KEY_KP3, | 52 | [ 0x07 ] = KEY_KP3, |
53 | [ 0x07 ] = KEY_CHANNELUP, | 53 | [ 0x08 ] = KEY_CHANNELUP, |
54 | [ 0x08 ] = KEY_KP4, | 54 | [ 0x09 ] = KEY_KP4, |
55 | [ 0x09 ] = KEY_KP5, | 55 | [ 0x0a ] = KEY_KP5, |
56 | [ 0x0a ] = KEY_KP6, | 56 | [ 0x0b ] = KEY_KP6, |
57 | 57 | [ 0x0c ] = KEY_CHANNELDOWN, | |
58 | [ 0x0b ] = KEY_CHANNELDOWN, | 58 | [ 0x0d ] = KEY_KP7, |
59 | [ 0x0c ] = KEY_KP7, | 59 | [ 0x0e ] = KEY_KP8, |
60 | [ 0x0d ] = KEY_KP8, | 60 | [ 0x0f ] = KEY_KP9, |
61 | [ 0x0e ] = KEY_KP9, | 61 | [ 0x10 ] = KEY_VOLUMEUP, |
62 | [ 0x0f ] = KEY_VOLUMEUP, | 62 | [ 0x11 ] = KEY_KP0, |
63 | [ 0x10 ] = KEY_KP0, | 63 | [ 0x12 ] = KEY_MENU, |
64 | [ 0x11 ] = KEY_MENU, | 64 | [ 0x13 ] = KEY_PRINT, |
65 | [ 0x12 ] = KEY_PRINT, | 65 | [ 0x14 ] = KEY_VOLUMEDOWN, |
66 | 66 | [ 0x16 ] = KEY_PAUSE, | |
67 | [ 0x13 ] = KEY_VOLUMEDOWN, | 67 | [ 0x18 ] = KEY_RECORD, |
68 | [ 0x15 ] = KEY_PAUSE, | 68 | [ 0x19 ] = KEY_REWIND, |
69 | [ 0x17 ] = KEY_RECORD, | 69 | [ 0x1a ] = KEY_PLAY, |
70 | [ 0x18 ] = KEY_REWIND, | 70 | [ 0x1b ] = KEY_FORWARD, |
71 | [ 0x19 ] = KEY_PLAY, | 71 | [ 0x1c ] = KEY_BACKSPACE, |
72 | [ 0x1b ] = KEY_BACKSPACE, | 72 | [ 0x1e ] = KEY_STOP, |
73 | [ 0x1d ] = KEY_STOP, | 73 | [ 0x40 ] = KEY_ZOOM, |
74 | [ 0x40 ] = KEY_ZOOM, | ||
75 | }; | 74 | }; |
76 | 75 | ||
77 | /* Mark Phalan <phalanm@o2.ie> */ | 76 | /* Mark Phalan <phalanm@o2.ie> */ |
@@ -402,7 +401,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr, | |||
402 | name = "KNC One"; | 401 | name = "KNC One"; |
403 | ir->get_key = get_key_knc1; | 402 | ir->get_key = get_key_knc1; |
404 | ir_type = IR_TYPE_OTHER; | 403 | ir_type = IR_TYPE_OTHER; |
405 | ir_codes = ir_codes_em2820; | 404 | ir_codes = ir_codes_empty; |
406 | } | 405 | } |
407 | break; | 406 | break; |
408 | case 0x47: | 407 | case 0x47: |
@@ -418,7 +417,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr, | |||
418 | name = "Purple TV"; | 417 | name = "Purple TV"; |
419 | ir->get_key = get_key_purpletv; | 418 | ir->get_key = get_key_purpletv; |
420 | ir_type = IR_TYPE_OTHER; | 419 | ir_type = IR_TYPE_OTHER; |
421 | ir_codes = ir_codes_empty; | 420 | ir_codes = ir_codes_purpletv; |
422 | } | 421 | } |
423 | break; | 422 | break; |
424 | default: | 423 | default: |