aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-11-03[media] V4L: sh_mobile_csi2: verify client compatibilityGuennadi Liakhovetski1-6/+52
Switch the meaning of the .lanes platform data parameter to specify the number of used lanes instead of a bitmask. Verify bus configuration compatibility with client's capabilities. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] ARM: ap4evb: switch imx074 configuration to default number of lanesGuennadi Liakhovetski1-1/+1
The sh_mobile_csi2 driver will change meaning of the .lanes platform data field from "bitmask of used lanes" to "number of used lanes." To avoid a regression during this transition switch ap4evb to rely on the 2 lane default. Signed-off-by: Guennadi Liakhovetski <[email protected]> Acked-by: Magnus Damm <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: rj54n1cb0c: support the new mbus-config subdev opsGuennadi Liakhovetski1-0/+34
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: ov9740: support the new mbus-config subdev opsGuennadi Liakhovetski1-7/+26
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: ov9640: support the new mbus-config subdev opsGuennadi Liakhovetski1-2/+20
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: ov772x: support the new mbus-config subdev opsGuennadi Liakhovetski1-3/+21
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: ov772x: rename macros to not pollute the global namespaceGuennadi Liakhovetski2-17/+16
Macros, defined in a header under include/ should be kept in a local namespace and not pollute the global one. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: ov6650: support the new mbus-config subdev opsGuennadi Liakhovetski1-1/+52
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: ov5642: support the new mbus-config subdev opsGuennadi Liakhovetski1-0/+12
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: ov2640: support the new mbus-config subdev opsGuennadi Liakhovetski1-2/+20
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: mt9v022: support the new mbus-config subdev opsGuennadi Liakhovetski1-1/+75
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: mt9t112: support the new mbus-config subdev opsGuennadi Liakhovetski1-39/+42
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: mt9t031: support the new mbus-config subdev opsGuennadi Liakhovetski1-0/+33
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: mt9m111: support the new mbus-config subdev opsGuennadi Liakhovetski1-1/+19
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: mt9m001: support the new mbus-config subdev opsGuennadi Liakhovetski1-1/+39
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: soc-camera: add helper functions for new bus configuration typeGuennadi Liakhovetski4-2/+73
Add helper functions to process the new media bus configuration type similar to soc_camera_apply_sensor_flags() and soc_camera_bus_param_compatible(). Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: imx074: support the new mbus-config subdev opsGuennadi Liakhovetski1-0/+12
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: sh_mobile_ceu_camera: remove duplicated codeGuennadi Liakhovetski1-3/+0
Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: sh_mobile_ceu_camera: fix field addresses in interleaved modeGuennadi Liakhovetski1-6/+19
In interlaced interleaved mode field offset for deinterlacing depends on the pixel format. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: sh_mobile_ceu_camera: don't try to improve client scaling, if ↵Guennadi Liakhovetski1-5/+16
perfect If the client has managed to configure the precise output format, we don't have to try to further improve it. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] V4L: sh_mobile_ceu_camera: output image sizes must be a multiple of 4Guennadi Liakhovetski1-18/+31
CEU can only produce images with 4 pixel aligned width and height. Enforce this alignment, adjust comments and simplify some calculations. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03staging: Move media drivers to staging/mediaMauro Carvalho Chehab83-22/+48
In practice, it is being hard to distinguish when a patch should go to staging tree or to the media tree. Better to distinguish it, by putting the media drivers at a separate staging directory. Newer staging drivers that include anything with "dvb*.h", "v4l2*.h" or "videodev2.h" should go to the drivers/staging/media tree. Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] move cx25821 out of stagingMauro Carvalho Chehab29-9/+3
This driver had the major issues already fixed. Move it out of staging. Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Remove conditional compilation based on kernel versionSylwester Nawrocki3-82/+1
Remove #if's related to kernel version and the code not applicable to 3.2+ kernels. Cc: Devin Heitmueller <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Unconditionally compile code dependent on DVB_CORESylwester Nawrocki4-23/+1
The driver depends on DVB_CORE so there is no need for conditional compilation of parts of the code depending on CONFIG_DVB_CORE as the driver is never compiled with CONFIG_DVB_CORE* disabled. Cc: Devin Heitmueller <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Add nBox Tuner Dongle supportPiotr Chmura2-0/+7
Add support for nBox Tuner Dongle based on the same chip. Cc: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Enable compilationPiotr Chmura3-2/+5
Fix compilation errors in the USB driver by replacing usb_buffer_free(), usb_buffer_alloc() with usb_free_coherent() and usb_alloc_coherent(). Add entries for the driver in parent Makefile and Kconfig. [[email protected]: minor edit to changelog] Cc: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Convert the comments to kernel-doc styleSylwester Nawrocki4-117/+106
Also amend some mismatched comments. Cc: Devin Heitmueller <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Remove non-linux headers inclusionPiotr Chmura4-67/+4
Remove inclusion of Windows and other not linux related headers. [[email protected]: edited changelog, folded long line in Makefile] Cc: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix licensing oversightPierrick Hascoet2-36/+36
Fix a couple of files which were supposed by be relicensed as GPL but were overlooked. Signed-off-by: Pierrick Hascoet <[email protected]> Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Properly handle multiple product namesDevin Heitmueller5-4/+35
Properly handle the case where the driver can be associated with multiple different products (as opposed to always saying the device is named after the value in a #define). Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Add Elgato EyeTV DTT DeluxeDevin Heitmueller2-0/+6
Add support for the Elgato EyeTV DTT Deluxe. Note that the product name field has not yet been abstracted out, so it will still identify itself as a PCTV 74e. The driver was originally built by the chipset manufacturer so that the product vendor can specify the device name via a #define, but wasn't setup to support multiple products from the same build of the driver. Thanks to Joerg Unglaub for suggesting this change. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as10x_cmd_cfg.cDevin Heitmueller1-132/+130
Fix Linux kernel coding style (whitespace and indentation) errors in file as10x_cmd_cfg.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as102_usb_drv.cDevin Heitmueller2-49/+72
Fix Linux kernel coding style (whitespace and indentation) errors in file as102_usb_drv.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as102_fe.cDevin Heitmueller1-224/+252
Fix Linux kernel coding style (whitespace and indentation) errors in file as102_fe.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as10x_cmd_stream.cDevin Heitmueller1-144/+136
Fix Linux kernel coding style (whitespace and indentation) errors in file as10x_cmd_stream.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as10x_cmd.cDevin Heitmueller1-285/+288
Fix Linux kernel coding style (whitespace and indentation) errors in file as10x_cmd.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as102_fw.cDevin Heitmueller1-43/+58
Fix Linux kernel coding style (whitespace and indentation) errors in file as102_fw.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as102_drv.cDevin Heitmueller1-48/+52
Fix Linux kernel coding style (whitespace and indentation) errors in file as102_drv.c. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Initial import from AbilisPierrick Hascoet15-0/+3694
Changes by Devin Heitmueller: Import the original Abilis Systems as102 driver. The source is unmodified, with the only changes I've made so far were that I created a Kconfig and Makefile so that the code builds in a standard v4l-dvb tree. This driver requires firmware (which Abilis has provided with redistribution terms which will allow it to be bundled in the Linux distributions). The firmware can be downloaded from here: Thanks to Rainer Miethling from PCTV Systems for working to get the driver released (for use with the PCTV 74e) and Pierrick Hascoet from Abilis for authoring the driver. Changes by Piotr Chmura: - moved the driver from media/dvb to staging/media - removed Makefile/Kconfig - compilation fails in current tree [[email protected]: edited changelog] Signed-off-by: Pierrick Hascoet <[email protected]> Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] mxl111sf: update demod_ops.info.name to "MaxLinear MxL111SF DVB-T ↵Michael Krufky1-5/+5
demodulator" Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] mxl111sf: disable snr / ber calculations for DVB-TMichael Krufky1-0/+10
Leaving this code enabled breaks the build on some architectures, and we shouldn't have any floating point math in the kernel, anyway. These macros need to be re-written, but it's harmless to simply return zero for now. Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] mxl111sf: add DVB-T supportMichael Krufky1-3/+225
Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] DVB: add MaxLinear MxL111SF DVB-T demodulator driverMichael Krufky4-1/+661
Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] cx18: Fix FM radioAndy Walls1-0/+2
The cx18 driver was not setting up the analog tuner driver to enable FM radio. This change fixes that. Thanks go to Ian Armstrong for reporting and fixing the analogous problem in ivtv. Signed-off-by: Andy Walls <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] ivtv: Fix radio supportIan Armstrong1-0/+2
Although the ivtv driver reports radio support through the V4L2 API, it fails to actually enable it. This patch fixes that. Signed-off-by: Ian Armstrong <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-10-31Merge branch 'v4l_for_linus' of ↵Linus Torvalds422-6631/+27936
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits) [media] pctv452e: Remove bogus code [media] adv7175: Make use of media bus pixel codes [media] media: vb2: fix incorrect return value [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES [media] cx23885: Stop the risc video fifo before reconfiguring it [media] cx23885: Avoid incorrect error handling and reporting [media] cx23885: Avoid stopping the risc engine during buffer timeout [media] cx23885: Removed a spurious function cx23885_set_scale() [media] cx23885: v4l2 api compliance, set the audioset field correctly [media] cx23885: hook the audio selection functions into the main driver [media] cx23885: add generic functions for dealing with audio input selection [media] cx23885: fixes related to maximum number of inputs and range checking [media] cx23885: Initial support for the MPX-885 mini-card [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use [media] cx23885: Enable audio line in support from the back panel [media] cx23885: Allow the audio mux config to be specified on a per input basis [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs [media] cx23885: Name an internal i2c part and declare a bitfield by name [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming [media] cx23885: remove channel dump diagnostics when a vbi buffer times out ... Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header file rename vs add)
2011-10-31Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds39-567/+634
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits) vlan: allow nested vlan_do_receive() ipv6: fix route lookup in addrconf_prefix_rcv() bonding: eliminate bond_close race conditions qlcnic: fix beacon and LED test. qlcnic: Updated License file qlcnic: updated reset sequence qlcnic: reset loopback mode if promiscous mode setting fails. qlcnic: skip IDC ack check in fw reset path. i825xx: Fix incorrect dependency for BVME6000_NET ipv6: fix route error binding peer in func icmp6_dst_alloc ipv6: fix error propagation in ip6_ufo_append_data() stmmac: update normal descriptor structure (v2) stmmac: fix NULL pointer dereference in capabilities fixup (v2) stmmac: fix a bug while checking the HW cap reg (v2) be2net: Changing MAC Address of a VF was broken. be2net: Refactored be_cmds.c file. bnx2x: update driver version to 1.70.30-0 bnx2x: use FW 7.0.29.0 bnx2x: Enable changing speed when port type is PORT_DA bnx2x: Fix 54618se LED behavior ...
2011-10-31Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcLinus Torvalds2-721/+115
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Fix masking and shifting in VIS fpcmp emulation. sparc32: Correct the return value of memcpy. sparc32: Remove uses of %g7 in memcpy implementation. sparc32: Remove non-kernel code from memcpy implementation.
2011-10-31Merge branch 'for-linus' of git://neil.brown.name/mdLinus Torvalds1-1/+1
* 'for-linus' of git://neil.brown.name/md: md/raid10: Fix bug when activating a hot-spare.