Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] em28xx: Add support for 1b80:e1cc Delock 61959

Hardware is the same as MaxMedia UB425-TC but ships with a different
remote.

Signed-off-by: Jakob Haufe <sur5r@sur5r.net>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Jakob Haufe and committed by
Mauro Carvalho Chehab
7c1dfdb0 3020bea5

+20 -2
+16
drivers/media/usb/em28xx/em28xx-cards.c
··· 374 374 #endif 375 375 376 376 /* 1b80:e425 MaxMedia UB425-TC 377 + * 1b80:e1cc Delock 61959 377 378 * GPIO_6 - demod reset, 0=active 378 379 * GPIO_7 - LED, 0=active 379 380 */ ··· 2018 2017 .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE | 2019 2018 EM28XX_I2C_FREQ_400_KHZ, 2020 2019 }, 2020 + /* 1b80:e1cc Delock 61959 2021 + * Empia EM2874B + Micronas DRX 3913KA2 + NXP TDA18271HDC2 2022 + * mostly the same as MaxMedia UB-425-TC but different remote */ 2023 + [EM2874_BOARD_DELOCK_61959] = { 2024 + .name = "Delock 61959", 2025 + .tuner_type = TUNER_ABSENT, 2026 + .tuner_gpio = maxmedia_ub425_tc, 2027 + .has_dvb = 1, 2028 + .ir_codes = RC_MAP_DELOCK_61959, 2029 + .def_i2c_bus = 1, 2030 + .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE | 2031 + EM28XX_I2C_FREQ_400_KHZ, 2032 + }, 2021 2033 }; 2022 2034 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); 2023 2035 ··· 2192 2178 .driver_info = EM2884_BOARD_PCTV_510E }, 2193 2179 { USB_DEVICE(0x2013, 0x0251), 2194 2180 .driver_info = EM2884_BOARD_PCTV_520E }, 2181 + { USB_DEVICE(0x1b80, 0xe1cc), 2182 + .driver_info = EM2874_BOARD_DELOCK_61959 }, 2195 2183 { }, 2196 2184 }; 2197 2185 MODULE_DEVICE_TABLE(usb, em28xx_id_table);
+3 -2
drivers/media/usb/em28xx/em28xx-dvb.c
··· 1216 1216 dvb_attach(a8293_attach, dvb->fe[0], &dev->i2c_adap[dev->def_i2c_bus], 1217 1217 &em28xx_a8293_config); 1218 1218 break; 1219 + case EM2874_BOARD_DELOCK_61959: 1219 1220 case EM2874_BOARD_MAXMEDIA_UB425_TC: 1220 1221 /* attach demodulator */ 1221 1222 dvb->fe[0] = dvb_attach(drxk_attach, &maxmedia_ub425_tc_drxk, ··· 1236 1235 } 1237 1236 1238 1237 /* TODO: we need drx-3913k firmware in order to support DVB-T */ 1239 - em28xx_info("MaxMedia UB425-TC: only DVB-C supported by that " \ 1240 - "driver version\n"); 1238 + em28xx_info("MaxMedia UB425-TC/Delock 61959: only DVB-C " \ 1239 + "supported by that driver version\n"); 1241 1240 1242 1241 break; 1243 1242 case EM2884_BOARD_PCTV_510E:
+1
drivers/media/usb/em28xx/em28xx.h
··· 130 130 #define EM2884_BOARD_PCTV_520E 86 131 131 #define EM2884_BOARD_TERRATEC_HTC_USB_XS 87 132 132 #define EM2884_BOARD_C3TECH_DIGITAL_DUO 88 133 + #define EM2874_BOARD_DELOCK_61959 89 133 134 134 135 /* Limits minimum and default number of buffers */ 135 136 #define EM28XX_MIN_BUF 4