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

media: cx231xx: Add support for Hauppauge HVR-975

Hauppauge HVR-975 is hybrid NTSC/PAL, QAM/ATSC, and DVB-C/T/T2 usb device.

Only ATSC/QAM front end is initially active. Second frontend support is
work in progress.

CX23102 + LG3306A/Si2168(WiP) + Si2157

Changes since v1:
- removed double semicolon

Signed-off-by: Brad Love <brad@nextdimension.cc>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

authored by

Brad Love and committed by
Mauro Carvalho Chehab
19fbf1ba c5bef50e

+117
+42
drivers/media/usb/cx231xx/cx231xx-cards.c
··· 961 961 .gpio = NULL, 962 962 } }, 963 963 }, 964 + [CX231XX_BOARD_HAUPPAUGE_975] = { 965 + .name = "Hauppauge WinTV-HVR-975", 966 + .tuner_type = TUNER_ABSENT, 967 + .tuner_addr = 0x60, 968 + .tuner_gpio = RDE250_XCV_TUNER, 969 + .tuner_sif_gpio = 0x05, 970 + .tuner_scl_gpio = 0x1a, 971 + .tuner_sda_gpio = 0x1b, 972 + .decoder = CX231XX_AVDECODER, 973 + .output_mode = OUT_MODE_VIP11, 974 + .demod_xfer_mode = 0, 975 + .ctl_pin_status_mask = 0xFFFFFFC4, 976 + .agc_analog_digital_select_gpio = 0x0c, 977 + .gpio_pin_status_mask = 0x4001000, 978 + .tuner_i2c_master = I2C_1_MUX_3, 979 + .demod_i2c_master = I2C_1_MUX_3, 980 + .has_dvb = 1, 981 + .demod_addr = 0x59, /* 0xb2 >> 1 */ 982 + .norm = V4L2_STD_ALL, 983 + 984 + .input = {{ 985 + .type = CX231XX_VMUX_TELEVISION, 986 + .vmux = CX231XX_VIN_3_1, 987 + .amux = CX231XX_AMUX_VIDEO, 988 + .gpio = NULL, 989 + }, { 990 + .type = CX231XX_VMUX_COMPOSITE1, 991 + .vmux = CX231XX_VIN_2_1, 992 + .amux = CX231XX_AMUX_LINE_IN, 993 + .gpio = NULL, 994 + }, { 995 + .type = CX231XX_VMUX_SVIDEO, 996 + .vmux = CX231XX_VIN_1_1 | 997 + (CX231XX_VIN_1_2 << 8) | 998 + CX25840_SVIDEO_ON, 999 + .amux = CX231XX_AMUX_LINE_IN, 1000 + .gpio = NULL, 1001 + } }, 1002 + }, 964 1003 }; 965 1004 const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); 966 1005 ··· 1033 994 .driver_info = CX231XX_BOARD_HAUPPAUGE_955Q}, 1034 995 {USB_DEVICE(0x2040, 0xb151), 1035 996 .driver_info = CX231XX_BOARD_HAUPPAUGE_935C}, 997 + {USB_DEVICE(0x2040, 0xb150), 998 + .driver_info = CX231XX_BOARD_HAUPPAUGE_975}, 1036 999 {USB_DEVICE(0x2040, 0xb130), 1037 1000 .driver_info = CX231XX_BOARD_HAUPPAUGE_930C_HD_1113xx}, 1038 1001 {USB_DEVICE(0x2040, 0xb131), ··· 1294 1253 case CX231XX_BOARD_HAUPPAUGE_930C_HD_1114xx: 1295 1254 case CX231XX_BOARD_HAUPPAUGE_955Q: 1296 1255 case CX231XX_BOARD_HAUPPAUGE_935C: 1256 + case CX231XX_BOARD_HAUPPAUGE_975: 1297 1257 { 1298 1258 struct eeprom { 1299 1259 struct tveeprom tvee;
+74
drivers/media/usb/cx231xx/cx231xx-dvb.c
··· 1143 1143 dev->dvb->i2c_client_tuner = client; 1144 1144 break; 1145 1145 } 1146 + case CX231XX_BOARD_HAUPPAUGE_975: 1147 + { 1148 + struct i2c_client *client; 1149 + struct i2c_adapter *adapter; 1150 + struct i2c_board_info info = {}; 1151 + struct si2157_config si2157_config = {}; 1152 + struct lgdt3306a_config lgdt3306a_config = {}; 1153 + 1154 + /* attach demodulator chip */ 1155 + lgdt3306a_config = hauppauge_955q_lgdt3306a_config; 1156 + lgdt3306a_config.fe = &dev->dvb->frontend; 1157 + lgdt3306a_config.i2c_adapter = &adapter; 1158 + 1159 + strlcpy(info.type, "lgdt3306a", sizeof(info.type)); 1160 + info.addr = dev->board.demod_addr; 1161 + info.platform_data = &lgdt3306a_config; 1162 + 1163 + request_module(info.type); 1164 + client = i2c_new_device(demod_i2c, &info); 1165 + if (client == NULL || client->dev.driver == NULL) { 1166 + result = -ENODEV; 1167 + goto out_free; 1168 + } 1169 + 1170 + if (!try_module_get(client->dev.driver->owner)) { 1171 + dev_err(dev->dev, 1172 + "Failed to attach %s frontend.\n", info.type); 1173 + i2c_unregister_device(client); 1174 + result = -ENODEV; 1175 + goto out_free; 1176 + } 1177 + 1178 + dvb->i2c_client_demod = client; 1179 + dev->dvb->frontend->ops.i2c_gate_ctrl = NULL; 1180 + 1181 + /* define general-purpose callback pointer */ 1182 + dvb->frontend->callback = cx231xx_tuner_callback; 1183 + 1184 + /* attach tuner */ 1185 + si2157_config.fe = dev->dvb->frontend; 1186 + #ifdef CONFIG_MEDIA_CONTROLLER_DVB 1187 + si2157_config.mdev = dev->media_dev; 1188 + #endif 1189 + si2157_config.if_port = 1; 1190 + si2157_config.inversion = true; 1191 + 1192 + memset(&info, 0, sizeof(struct i2c_board_info)); 1193 + strlcpy(info.type, "si2157", I2C_NAME_SIZE); 1194 + info.addr = dev->board.tuner_addr; 1195 + info.platform_data = &si2157_config; 1196 + request_module("si2157"); 1197 + 1198 + client = i2c_new_device(tuner_i2c, &info); 1199 + if (client == NULL || client->dev.driver == NULL) { 1200 + module_put(dvb->i2c_client_demod->dev.driver->owner); 1201 + i2c_unregister_device(dvb->i2c_client_demod); 1202 + result = -ENODEV; 1203 + goto out_free; 1204 + } 1205 + 1206 + if (!try_module_get(client->dev.driver->owner)) { 1207 + dev_err(dev->dev, 1208 + "Failed to obtain %s tuner.\n", info.type); 1209 + i2c_unregister_device(client); 1210 + module_put(dvb->i2c_client_demod->dev.driver->owner); 1211 + i2c_unregister_device(dvb->i2c_client_demod); 1212 + result = -ENODEV; 1213 + goto out_free; 1214 + } 1215 + 1216 + dev->cx231xx_reset_analog_tuner = NULL; 1217 + dev->dvb->i2c_client_tuner = client; 1218 + break; 1219 + } 1146 1220 default: 1147 1221 dev_err(dev->dev, 1148 1222 "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",
+1
drivers/media/usb/cx231xx/cx231xx.h
··· 82 82 #define CX231XX_BOARD_ASTROMETA_T2HYBRID 24 83 83 #define CX231XX_BOARD_THE_IMAGING_SOURCE_DFG_USB2_PRO 25 84 84 #define CX231XX_BOARD_HAUPPAUGE_935C 26 85 + #define CX231XX_BOARD_HAUPPAUGE_975 27 85 86 86 87 /* Limits minimum and default number of buffers */ 87 88 #define CX231XX_MIN_BUF 4