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

Configure Feed

Select the types of activity you want to include in your feed.

Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules
V4L/DVB (4608b): i2c deps fix on DVB
V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install
V4L/DVB (4520): Fix an error when loading bttv driver on PV M4900.
V4L/DVB (4511): Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality
V4L/DVB (4494a): Fix compilation when V4L1 support is not present

Linus Torvalds 7366935a 3ee4b889

+79 -56
+1 -1
drivers/media/Kconfig
··· 53 53 If you are unsure as to whether this is required, answer Y. 54 54 55 55 config VIDEO_V4L2 56 - tristate 56 + bool 57 57 default y 58 58 59 59 source "drivers/media/video/Kconfig"
+2
drivers/media/common/saa7146_video.c
··· 1190 1190 } 1191 1191 return err; 1192 1192 } 1193 + #ifdef CONFIG_VIDEO_V4L1_COMPAT 1193 1194 case VIDIOCGMBUF: 1194 1195 { 1195 1196 struct video_mbuf *mbuf = arg; ··· 1219 1218 mutex_unlock(&q->lock); 1220 1219 return 0; 1221 1220 } 1221 + #endif 1222 1222 default: 1223 1223 return v4l_compat_translate_ioctl(inode,file,cmd,arg, 1224 1224 saa7146_video_do_ioctl);
+1
drivers/media/dvb/b2c2/Kconfig
··· 1 1 config DVB_B2C2_FLEXCOP 2 2 tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters" 3 3 depends on DVB_CORE && I2C 4 + select DVB_PLL 4 5 select DVB_STV0299 5 6 select DVB_MT352 6 7 select DVB_MT312
+1
drivers/media/dvb/bt8xx/Kconfig
··· 1 1 config DVB_BT8XX 2 2 tristate "BT8xx based PCI cards" 3 3 depends on DVB_CORE && PCI && I2C && VIDEO_BT848 4 + select DVB_PLL 4 5 select DVB_MT352 5 6 select DVB_SP887X 6 7 select DVB_NXT6000
+1
drivers/media/dvb/dvb-usb/Kconfig
··· 2 2 tristate "Support for various USB DVB devices" 3 3 depends on DVB_CORE && USB && I2C 4 4 select FW_LOADER 5 + select DVB_PLL 5 6 help 6 7 By enabling this you will be able to choose the various supported 7 8 USB1.1 and USB2.0 DVB devices.
+32 -28
drivers/media/dvb/frontends/Kconfig
··· 6 6 7 7 config DVB_STV0299 8 8 tristate "ST STV0299 based" 9 - depends on DVB_CORE 9 + depends on DVB_CORE && I2C 10 10 help 11 11 A DVB-S tuner module. Say Y when you want to support this frontend. 12 12 13 13 config DVB_CX24110 14 14 tristate "Conexant CX24110 based" 15 - depends on DVB_CORE 15 + depends on DVB_CORE && I2C 16 16 help 17 17 A DVB-S tuner module. Say Y when you want to support this frontend. 18 18 19 19 config DVB_CX24123 20 20 tristate "Conexant CX24123 based" 21 - depends on DVB_CORE 21 + depends on DVB_CORE && I2C 22 22 help 23 23 A DVB-S tuner module. Say Y when you want to support this frontend. 24 24 25 25 config DVB_TDA8083 26 26 tristate "Philips TDA8083 based" 27 - depends on DVB_CORE 27 + depends on DVB_CORE && I2C 28 28 help 29 29 A DVB-S tuner module. Say Y when you want to support this frontend. 30 30 31 31 config DVB_MT312 32 32 tristate "Zarlink VP310/MT312 based" 33 - depends on DVB_CORE 33 + depends on DVB_CORE && I2C 34 34 help 35 35 A DVB-S tuner module. Say Y when you want to support this frontend. 36 36 37 37 config DVB_VES1X93 38 38 tristate "VLSI VES1893 or VES1993 based" 39 - depends on DVB_CORE 39 + depends on DVB_CORE && I2C 40 40 help 41 41 A DVB-S tuner module. Say Y when you want to support this frontend. 42 42 43 43 config DVB_S5H1420 44 44 tristate "Samsung S5H1420 based" 45 - depends on DVB_CORE 45 + depends on DVB_CORE && I2C 46 46 help 47 47 A DVB-S tuner module. Say Y when you want to support this frontend. 48 48 ··· 51 51 52 52 config DVB_SP8870 53 53 tristate "Spase sp8870 based" 54 - depends on DVB_CORE 54 + depends on DVB_CORE && I2C 55 55 select FW_LOADER 56 56 help 57 57 A DVB-T tuner module. Say Y when you want to support this frontend. ··· 63 63 64 64 config DVB_SP887X 65 65 tristate "Spase sp887x based" 66 - depends on DVB_CORE 66 + depends on DVB_CORE && I2C 67 67 select FW_LOADER 68 68 help 69 69 A DVB-T tuner module. Say Y when you want to support this frontend. ··· 75 75 76 76 config DVB_CX22700 77 77 tristate "Conexant CX22700 based" 78 - depends on DVB_CORE 78 + depends on DVB_CORE && I2C 79 79 help 80 80 A DVB-T tuner module. Say Y when you want to support this frontend. 81 81 82 82 config DVB_CX22702 83 83 tristate "Conexant cx22702 demodulator (OFDM)" 84 - depends on DVB_CORE 84 + depends on DVB_CORE && I2C 85 85 help 86 86 A DVB-T tuner module. Say Y when you want to support this frontend. 87 87 88 88 config DVB_L64781 89 89 tristate "LSI L64781" 90 - depends on DVB_CORE 90 + depends on DVB_CORE && I2C 91 91 help 92 92 A DVB-T tuner module. Say Y when you want to support this frontend. 93 93 94 94 config DVB_TDA1004X 95 95 tristate "Philips TDA10045H/TDA10046H based" 96 - depends on DVB_CORE 96 + depends on DVB_CORE && I2C 97 97 select FW_LOADER 98 98 help 99 99 A DVB-T tuner module. Say Y when you want to support this frontend. ··· 106 106 107 107 config DVB_NXT6000 108 108 tristate "NxtWave Communications NXT6000 based" 109 - depends on DVB_CORE 109 + depends on DVB_CORE && I2C 110 110 help 111 111 A DVB-T tuner module. Say Y when you want to support this frontend. 112 112 113 113 config DVB_MT352 114 114 tristate "Zarlink MT352 based" 115 - depends on DVB_CORE 115 + depends on DVB_CORE && I2C 116 116 help 117 117 A DVB-T tuner module. Say Y when you want to support this frontend. 118 118 119 119 config DVB_ZL10353 120 120 tristate "Zarlink ZL10353 based" 121 - depends on DVB_CORE 121 + depends on DVB_CORE && I2C 122 122 help 123 123 A DVB-T tuner module. Say Y when you want to support this frontend. 124 124 125 125 config DVB_DIB3000MB 126 126 tristate "DiBcom 3000M-B" 127 - depends on DVB_CORE 127 + depends on DVB_CORE && I2C 128 128 help 129 129 A DVB-T tuner module. Designed for mobile usage. Say Y when you want 130 130 to support this frontend. 131 131 132 132 config DVB_DIB3000MC 133 133 tristate "DiBcom 3000P/M-C" 134 - depends on DVB_CORE 134 + depends on DVB_CORE && I2C 135 135 help 136 136 A DVB-T tuner module. Designed for mobile usage. Say Y when you want 137 137 to support this frontend. ··· 141 141 142 142 config DVB_VES1820 143 143 tristate "VLSI VES1820 based" 144 - depends on DVB_CORE 144 + depends on DVB_CORE && I2C 145 145 help 146 146 A DVB-C tuner module. Say Y when you want to support this frontend. 147 147 148 148 config DVB_TDA10021 149 149 tristate "Philips TDA10021 based" 150 - depends on DVB_CORE 150 + depends on DVB_CORE && I2C 151 151 help 152 152 A DVB-C tuner module. Say Y when you want to support this frontend. 153 153 154 154 config DVB_STV0297 155 155 tristate "ST STV0297 based" 156 - depends on DVB_CORE 156 + depends on DVB_CORE && I2C 157 157 help 158 158 A DVB-C tuner module. Say Y when you want to support this frontend. 159 159 ··· 162 162 163 163 config DVB_NXT200X 164 164 tristate "NxtWave Communications NXT2002/NXT2004 based" 165 - depends on DVB_CORE 165 + depends on DVB_CORE && I2C 166 166 select FW_LOADER 167 167 help 168 168 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want ··· 176 176 177 177 config DVB_OR51211 178 178 tristate "Oren OR51211 based" 179 - depends on DVB_CORE 179 + depends on DVB_CORE && I2C 180 180 select FW_LOADER 181 181 help 182 182 An ATSC 8VSB tuner module. Say Y when you want to support this frontend. ··· 188 188 189 189 config DVB_OR51132 190 190 tristate "Oren OR51132 based" 191 - depends on DVB_CORE 191 + depends on DVB_CORE && I2C 192 192 select FW_LOADER 193 193 help 194 194 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want ··· 203 203 204 204 config DVB_BCM3510 205 205 tristate "Broadcom BCM3510" 206 - depends on DVB_CORE 206 + depends on DVB_CORE && I2C 207 207 select FW_LOADER 208 208 help 209 209 An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to ··· 211 211 212 212 config DVB_LGDT330X 213 213 tristate "LG Electronics LGDT3302/LGDT3303 based" 214 - depends on DVB_CORE 214 + depends on DVB_CORE && I2C 215 215 help 216 216 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want 217 217 to support this frontend. ··· 220 220 comment "Miscellaneous devices" 221 221 depends on DVB_CORE 222 222 223 + config DVB_PLL 224 + tristate 225 + depends on DVB_CORE && I2C 226 + 223 227 config DVB_LNBP21 224 228 tristate "LNBP21 SEC controller" 225 - depends on DVB_CORE 229 + depends on DVB_CORE && I2C 226 230 help 227 231 An SEC control chip. 228 232 229 233 config DVB_ISL6421 230 234 tristate "ISL6421 SEC controller" 231 - depends on DVB_CORE 235 + depends on DVB_CORE && I2C 232 236 help 233 237 An SEC control chip. 234 238
+1 -1
drivers/media/dvb/frontends/Makefile
··· 4 4 5 5 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ 6 6 7 - obj-$(CONFIG_DVB_CORE) += dvb-pll.o 7 + obj-$(CONFIG_DVB_PLL) += dvb-pll.o 8 8 obj-$(CONFIG_DVB_STV0299) += stv0299.o 9 9 obj-$(CONFIG_DVB_SP8870) += sp8870.o 10 10 obj-$(CONFIG_DVB_CX22700) += cx22700.o
+1
drivers/media/dvb/pluto2/Kconfig
··· 2 2 tristate "Pluto2 cards" 3 3 depends on DVB_CORE && PCI && I2C 4 4 select I2C_ALGOBIT 5 + select DVB_PLL 5 6 select DVB_TDA1004X 6 7 help 7 8 Support for PCI cards based on the Pluto2 FPGA like the Satelco
+5
drivers/media/dvb/ttpci/Kconfig
··· 3 3 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 4 4 select FW_LOADER 5 5 select VIDEO_SAA7146_VV 6 + select DVB_PLL 6 7 select DVB_VES1820 7 8 select DVB_VES1X93 8 9 select DVB_STV0299 ··· 62 61 tristate "Budget cards" 63 62 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 64 63 select VIDEO_SAA7146 64 + select DVB_PLL 65 65 select DVB_STV0299 66 66 select DVB_VES1X93 67 67 select DVB_VES1820 ··· 85 83 tristate "Budget cards with onboard CI connector" 86 84 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 87 85 select VIDEO_SAA7146 86 + select DVB_PLL 88 87 select DVB_STV0297 89 88 select DVB_STV0299 90 89 select DVB_TDA1004X ··· 107 104 tristate "Budget cards with analog video inputs" 108 105 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 109 106 select VIDEO_SAA7146_VV 107 + select DVB_PLL 110 108 select DVB_STV0299 111 109 select DVB_TDA1004X 112 110 select DVB_TDA10021 ··· 126 122 tristate "AV7110 cards with Budget Patch" 127 123 depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1 128 124 select DVB_AV7110 125 + select DVB_PLL 129 126 select DVB_STV0299 130 127 select DVB_VES1X93 131 128 select DVB_TDA8083
+2 -1
drivers/media/dvb/ttusb-budget/Kconfig
··· 1 1 config DVB_TTUSB_BUDGET 2 2 tristate "Technotrend/Hauppauge Nova-USB devices" 3 - depends on DVB_CORE && USB 3 + depends on DVB_CORE && USB && I2C 4 + select DVB_PLL 4 5 select DVB_CX22700 5 6 select DVB_TDA1004X 6 7 select DVB_VES1820
+4 -4
drivers/media/video/Kconfig
··· 260 260 261 261 config VIDEO_MXB 262 262 tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" 263 - depends on PCI && VIDEO_V4L1 263 + depends on PCI && VIDEO_V4L1 && I2C 264 264 select VIDEO_SAA7146_VV 265 265 select VIDEO_TUNER 266 266 ---help--- ··· 272 272 273 273 config VIDEO_DPC 274 274 tristate "Philips-Semiconductors 'dpc7146 demonstration board'" 275 - depends on PCI && VIDEO_V4L1 275 + depends on PCI && VIDEO_V4L1 && I2C 276 276 select VIDEO_SAA7146_VV 277 277 select VIDEO_V4L2 278 278 ---help--- ··· 287 287 288 288 config VIDEO_HEXIUM_ORION 289 289 tristate "Hexium HV-PCI6 and Orion frame grabber" 290 - depends on PCI && VIDEO_V4L1 290 + depends on PCI && VIDEO_V4L1 && I2C 291 291 select VIDEO_SAA7146_VV 292 292 select VIDEO_V4L2 293 293 ---help--- ··· 299 299 300 300 config VIDEO_HEXIUM_GEMINI 301 301 tristate "Hexium Gemini frame grabber" 302 - depends on PCI && VIDEO_V4L1 302 + depends on PCI && VIDEO_V4L1 && I2C 303 303 select VIDEO_SAA7146_VV 304 304 select VIDEO_V4L2 305 305 ---help---
+1
drivers/media/video/bt8xx/bttv-input.c
··· 303 303 ir->mask_keyup = 0x010000; 304 304 ir->polling = 50; // ms 305 305 break; 306 + case BTTV_BOARD_PV_M4900: 306 307 case BTTV_BOARD_PV_BT878P_9B: 307 308 case BTTV_BOARD_PV_BT878P_PLUS: 308 309 ir_codes = ir_codes_pixelview;
+1
drivers/media/video/cx88/Kconfig
··· 51 51 tristate "DVB/ATSC Support for cx2388x based TV cards" 52 52 depends on VIDEO_CX88 && DVB_CORE 53 53 select VIDEO_BUF_DVB 54 + select DVB_PLL 54 55 ---help--- 55 56 This adds support for DVB/ATSC cards based on the 56 57 Conexant 2388x chip.
+1
drivers/media/video/saa7134/Kconfig
··· 40 40 depends on VIDEO_SAA7134 && DVB_CORE 41 41 select VIDEO_BUF_DVB 42 42 select FW_LOADER 43 + select DVB_PLL 43 44 ---help--- 44 45 This adds support for DVB cards based on the 45 46 Philips saa7134 chip.
+8 -2
drivers/media/video/tuner-types.c
··· 926 926 927 927 /* ------------ TUNER_YMEC_TVF66T5_B_DFF - Philips PAL ------------ */ 928 928 929 + static struct tuner_range tuner_ymec_tvf66t5_b_dff_pal_ranges[] = { 930 + { 16 * 160.25 /*MHz*/, 0x8e, 0x01, }, 931 + { 16 * 464.25 /*MHz*/, 0x8e, 0x02, }, 932 + { 16 * 999.99 , 0x8e, 0x08, }, 933 + }; 934 + 929 935 static struct tuner_params tuner_ymec_tvf66t5_b_dff_params[] = { 930 936 { 931 937 .type = TUNER_PARAM_TYPE_PAL, 932 - .ranges = tuner_tena_9533_di_pal_ranges, 933 - .count = ARRAY_SIZE(tuner_tena_9533_di_pal_ranges), 938 + .ranges = tuner_ymec_tvf66t5_b_dff_pal_ranges, 939 + .count = ARRAY_SIZE(tuner_ymec_tvf66t5_b_dff_pal_ranges), 934 940 }, 935 941 }; 936 942
+1 -1
drivers/media/video/zoran.h
··· 267 267 }; 268 268 269 269 /* whoops, this one is undeclared if !v4l2 */ 270 - #ifndef HAVE_V4L2 270 + #ifndef CONFIG_VIDEO_V4L2 271 271 struct v4l2_jpegcompression { 272 272 int quality; 273 273 int APPn;
+11 -11
drivers/media/video/zoran_driver.c
··· 86 86 #include "zoran_device.h" 87 87 #include "zoran_card.h" 88 88 89 - #ifdef HAVE_V4L2 89 + #ifdef CONFIG_VIDEO_V4L2 90 90 /* we declare some card type definitions here, they mean 91 91 * the same as the v4l1 ZORAN_VID_TYPE above, except it's v4l2 */ 92 92 #define ZORAN_V4L2_VID_FLAGS ( \ ··· 103 103 { 104 104 .name = "15-bit RGB", 105 105 .palette = VIDEO_PALETTE_RGB555, 106 - #ifdef HAVE_V4L2 106 + #ifdef CONFIG_VIDEO_V4L2 107 107 #ifdef __LITTLE_ENDIAN 108 108 .fourcc = V4L2_PIX_FMT_RGB555, 109 109 #else ··· 117 117 }, { 118 118 .name = "16-bit RGB", 119 119 .palette = VIDEO_PALETTE_RGB565, 120 - #ifdef HAVE_V4L2 120 + #ifdef CONFIG_VIDEO_V4L2 121 121 #ifdef __LITTLE_ENDIAN 122 122 .fourcc = V4L2_PIX_FMT_RGB565, 123 123 #else ··· 131 131 }, { 132 132 .name = "24-bit RGB", 133 133 .palette = VIDEO_PALETTE_RGB24, 134 - #ifdef HAVE_V4L2 134 + #ifdef CONFIG_VIDEO_V4L2 135 135 #ifdef __LITTLE_ENDIAN 136 136 .fourcc = V4L2_PIX_FMT_BGR24, 137 137 #else ··· 145 145 }, { 146 146 .name = "32-bit RGB", 147 147 .palette = VIDEO_PALETTE_RGB32, 148 - #ifdef HAVE_V4L2 148 + #ifdef CONFIG_VIDEO_V4L2 149 149 #ifdef __LITTLE_ENDIAN 150 150 .fourcc = V4L2_PIX_FMT_BGR32, 151 151 #else ··· 159 159 }, { 160 160 .name = "4:2:2, packed, YUYV", 161 161 .palette = VIDEO_PALETTE_YUV422, 162 - #ifdef HAVE_V4L2 162 + #ifdef CONFIG_VIDEO_V4L2 163 163 .fourcc = V4L2_PIX_FMT_YUYV, 164 164 .colorspace = V4L2_COLORSPACE_SMPTE170M, 165 165 #endif ··· 169 169 }, { 170 170 .name = "Hardware-encoded Motion-JPEG", 171 171 .palette = -1, 172 - #ifdef HAVE_V4L2 172 + #ifdef CONFIG_VIDEO_V4L2 173 173 .fourcc = V4L2_PIX_FMT_MJPEG, 174 174 .colorspace = V4L2_COLORSPACE_SMPTE170M, 175 175 #endif ··· 210 210 module_param(lock_norm, int, 0); 211 211 MODULE_PARM_DESC(lock_norm, "Users can't change norm"); 212 212 213 - #ifdef HAVE_V4L2 213 + #ifdef CONFIG_VIDEO_V4L2 214 214 /* small helper function for calculating buffersizes for v4l2 215 215 * we calculate the nearest higher power-of-two, which 216 216 * will be the recommended buffersize */ ··· 1761 1761 return wait_grab_pending(zr); 1762 1762 } 1763 1763 1764 - #ifdef HAVE_V4L2 1764 + #ifdef CONFIG_VIDEO_V4L2 1765 1765 /* get the status of a buffer in the clients buffer queue */ 1766 1766 static int 1767 1767 zoran_v4l2_buffer_status (struct file *file, ··· 2676 2676 } 2677 2677 break; 2678 2678 2679 - #ifdef HAVE_V4L2 2679 + #ifdef CONFIG_VIDEO_V4L2 2680 2680 2681 2681 /* The new video4linux2 capture interface - much nicer than video4linux1, since 2682 2682 * it allows for integrating the JPEG capturing calls inside standard v4l2 ··· 4689 4689 struct video_device zoran_template __devinitdata = { 4690 4690 .name = ZORAN_NAME, 4691 4691 .type = ZORAN_VID_TYPE, 4692 - #ifdef HAVE_V4L2 4692 + #ifdef CONFIG_VIDEO_V4L2 4693 4693 .type2 = ZORAN_V4L2_VID_FLAGS, 4694 4694 #endif 4695 4695 .hardware = ZORAN_HARDWARE,
+1 -2
include/linux/videodev.h
··· 14 14 15 15 #include <linux/videodev2.h> 16 16 17 - #ifdef CONFIG_VIDEO_V4L1_COMPAT 18 - #define HAVE_V4L1 1 17 + #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__) 19 18 20 19 struct video_capability 21 20 {
-2
include/linux/videodev2.h
··· 22 22 #endif 23 23 #include <linux/types.h> 24 24 25 - #define HAVE_V4L2 1 26 - 27 25 /* 28 26 * Common stuff for both V4L1 and V4L2 29 27 * Moved from videodev.h
+4 -3
include/media/v4l2-dev.h
··· 194 194 195 195 196 196 int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i); 197 - #ifdef HAVE_V4L1 197 + #ifdef CONFIG_VIDEO_V4L1_COMPAT 198 198 /* buffer type is struct vidio_mbuf * */ 199 199 int (*vidiocgmbuf) (struct file *file, void *fh, struct video_mbuf *p); 200 200 #endif ··· 335 335 unsigned int cmd, void *arg)); 336 336 337 337 338 - #ifdef HAVE_V4L1 338 + #ifdef CONFIG_VIDEO_V4L1_COMPAT 339 339 #include <linux/mm.h> 340 340 341 341 extern struct video_device* video_devdata(struct file*); ··· 357 357 class_device_remove_file(&vfd->class_dev, attr); 358 358 } 359 359 360 + #endif /* CONFIG_VIDEO_V4L1_COMPAT */ 361 + 360 362 #ifdef OBSOLETE_OWNER /* to be removed soon */ 361 363 /* helper functions to access driver private data. */ 362 364 static inline void *video_get_drvdata(struct video_device *dev) ··· 374 372 375 373 extern int video_exclusive_open(struct inode *inode, struct file *file); 376 374 extern int video_exclusive_release(struct inode *inode, struct file *file); 377 - #endif /* HAVE_V4L1 */ 378 375 379 376 #endif /* _V4L2_DEV_H */