3 files changed, 34 insertions, 0 deletions

diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 4952aeb5dd80..3534cdc1f953 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -2511,3 +2511,35 @@ IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE] = {
 
 };
 EXPORT_SYMBOL_GPL(ir_codes_real_audio_220_32_keys);
+
+/* ATI TV Wonder HD 600 USB
+   Devin Heitmueller <devin.heitmueller@gmail.com>
+ */
+IR_KEYTAB_TYPE ir_codes_ati_tv_wonder_hd_600[IR_KEYTAB_SIZE] = {
+        [0x00] = KEY_RECORD,            /* Row 1 */
+        [0x01] = KEY_PLAYPAUSE,
+        [0x02] = KEY_STOP,
+        [0x03] = KEY_POWER,
+        [0x04] = KEY_PREVIOUS,  /* Row 2 */
+        [0x05] = KEY_REWIND,
+        [0x06] = KEY_FORWARD,
+        [0x07] = KEY_NEXT,
+        [0x08] = KEY_EPG,               /* Row 3 */
+        [0x09] = KEY_HOME,
+        [0x0a] = KEY_MENU,
+        [0x0b] = KEY_CHANNELUP,
+        [0x0c] = KEY_BACK,              /* Row 4 */
+        [0x0d] = KEY_UP,
+        [0x0e] = KEY_INFO,
+        [0x0f] = KEY_CHANNELDOWN,
+        [0x10] = KEY_LEFT,              /* Row 5 */
+        [0x11] = KEY_SELECT,
+        [0x12] = KEY_RIGHT,
+        [0x13] = KEY_VOLUMEUP,
+        [0x14] = KEY_LAST,              /* Row 6 */
+        [0x15] = KEY_DOWN,
+        [0x16] = KEY_MUTE,
+        [0x17] = KEY_VOLUMEDOWN,
+};
+
+EXPORT_SYMBOL_GPL(ir_codes_ati_tv_wonder_hd_600);
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 3b585486f7fe..75b2af2bf4cf 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -640,6 +640,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_12mhz_i2s  = 1,
                 .has_dvb        = 1,
+                .ir_codes       = ir_codes_ati_tv_wonder_hd_600,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 38f2d93c3957..3a88e13a20e9 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -157,6 +157,7 @@ extern IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_encore_enltv_fm53[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_msi_tvanywhere_plus[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_ati_tv_wonder_hd_600[IR_KEYTAB_SIZE];
 #endif
 
 /*