[media] Add support for new revision of KNC 1 DVB-C cards. Using tda10024 instead of tda10023, which is compatible to tda10023 driver

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

kernel os linux

Signed-off-by: Julian Scheel <julian@jusst.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Julian Scheel and committed by

Mauro Carvalho Chehab 14 years ago 93165b77 3188d548

3 changed files

expand all

drivers

media

dvb

ttpci

budget-av.c

budget-core.c

budget.h

drivers/media/dvb/ttpci/budget-av.c

··· 1197 1197 #define SUBID_DVBC_KNC1 0x0020 1198 1198 #define SUBID_DVBC_KNC1_PLUS 0x0021 1199 1199 #define SUBID_DVBC_KNC1_MK3 0x0022 1200 + #define SUBID_DVBC_KNC1_TDA10024 0x0028 1200 1201 #define SUBID_DVBC_KNC1_PLUS_MK3 0x0023 1201 1202 #define SUBID_DVBC_CINERGY1200 0x1156 1202 1203 #define SUBID_DVBC_CINERGY1200_MK3 0x1176 ··· 1317 1316 case SUBID_DVBC_EASYWATCH_MK3: 1318 1317 case SUBID_DVBC_CINERGY1200_MK3: 1319 1318 case SUBID_DVBC_KNC1_MK3: 1319 + case SUBID_DVBC_KNC1_TDA10024: 1320 1320 case SUBID_DVBC_KNC1_PLUS_MK3: 1321 1321 budget_av->reinitialise_demod = 1; 1322 1322 budget_av->budget.dev->i2c_bitrate = SAA7146_I2C_BUS_BIT_RATE_240; ··· 1560 1558 MAKE_BUDGET_INFO(knc1spx4, "KNC1 DVB-S Plus X4", BUDGET_KNC1SP); 1561 1559 MAKE_BUDGET_INFO(knc1cp, "KNC1 DVB-C Plus", BUDGET_KNC1CP); 1562 1560 MAKE_BUDGET_INFO(knc1cmk3, "KNC1 DVB-C MK3", BUDGET_KNC1C_MK3); 1561 + MAKE_BUDGET_INFO(knc1ctda10024, "KNC1 DVB-C TDA10024", BUDGET_KNC1C_TDA10024); 1563 1562 MAKE_BUDGET_INFO(knc1cpmk3, "KNC1 DVB-C Plus MK3", BUDGET_KNC1CP_MK3); 1564 1563 MAKE_BUDGET_INFO(knc1tp, "KNC1 DVB-T Plus", BUDGET_KNC1TP); 1565 1564 MAKE_BUDGET_INFO(cin1200s, "TerraTec Cinergy 1200 DVB-S", BUDGET_CIN1200S); ··· 1590 1587 MAKE_EXTENSION_PCI(knc1c, 0x1894, 0x0020), 1591 1588 MAKE_EXTENSION_PCI(knc1cp, 0x1894, 0x0021), 1592 1589 MAKE_EXTENSION_PCI(knc1cmk3, 0x1894, 0x0022), 1590 + MAKE_EXTENSION_PCI(knc1ctda10024, 0x1894, 0x0028), 1593 1591 MAKE_EXTENSION_PCI(knc1cpmk3, 0x1894, 0x0023), 1594 1592 MAKE_EXTENSION_PCI(knc1t, 0x1894, 0x0030), 1595 1593 MAKE_EXTENSION_PCI(knc1tp, 0x1894, 0x0031),

drivers/media/dvb/ttpci/budget-core.c

··· 110 110 break; 111 111 case BUDGET_CIN1200C_MK3: 112 112 case BUDGET_KNC1C_MK3: 113 + case BUDGET_KNC1C_TDA10024: 113 114 case BUDGET_KNC1CP_MK3: 114 115 if (budget->video_port == BUDGET_VIDEO_PORTA) { 115 116 saa7146_write(dev, DD1_INIT, 0x06000200); ··· 435 434 case BUDGET_KNC1CP: 436 435 case BUDGET_CIN1200C: 437 436 case BUDGET_KNC1C_MK3: 437 + case BUDGET_KNC1C_TDA10024: 438 438 case BUDGET_KNC1CP_MK3: 439 439 case BUDGET_CIN1200C_MK3: 440 440 budget->buffer_width = TS_WIDTH_DVBC;

drivers/media/dvb/ttpci/budget.h

··· 104 104 #define BUDGET_KNC1C_MK3 16 105 105 #define BUDGET_KNC1CP_MK3 17 106 106 #define BUDGET_KNC1S2 18 107 + #define BUDGET_KNC1C_TDA10024 19 107 108 108 109 #define BUDGET_VIDEO_PORTA 0 109 110 #define BUDGET_VIDEO_PORTB 1