Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 853041f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (35 commits)
  V4L/DVB (9516): cx18: Move DVB buffer transfer handling from irq handler to work_queue
  V4L/DVB (9557): gspca: Small changes for the sensor HV7131B in zc3xx.
  V4L/DVB (9556): gspca: Bad init sequence for sensor HV7131B in zc3xx.
  V4L/DVB (9549): gspca: Fix a typo in one of gspca chips name.
  V4L/DVB (9515): cx18: Use correct Mailbox IRQ Ack values and misc IRQ handling cleanup
  V4L/DVB (9493): kconfig patch
  V4L/DVB (9527): af9015: fix compile warnings
  V4L/DVB (9524): af9013: fix bug in status reading
  V4L/DVB (9511): cx18: Mark CX18_CPU_DE_RELEASE_MDL as a slow API call
  V4L/DVB (9510): cx18: Fix write retries for registers that always change - part 2.
  V4L/DVB (9506): ivtv/cx18: fix test whether modules should be loaded or not.
  V4L/DVB (9499): cx88-mpeg: final fix for analogue only compilation + de-alloc fix
  V4L/DVB (9496): cx88-blackbird: bugfix: cx88-blackbird-mpeg-users
  V4L/DVB (9495): cx88-blackbird: bugfix: cx88-blackbird-poll-fix
  V4L/DVB (9494): anysee: initialize anysee_usb_mutex statically
  V4L/DVB (9492): unplug oops from dvb_frontend_init...
  V4L/DVB (9486): ivtv/ivtvfb: no longer experimental
  V4L/DVB (9485): ivtv: remove incorrect V4L1 & tvaudio dependency
  V4L/DVB (9482): Documentation, especially regarding audio and informational links
  V4L/DVB (9475): cx18: Disable write retries for registers that always change - part 1.
  ...
parents e892873c 1d6782bd

Documentation/feature-removal-schedule.txt

+0 −24
Original line number Diff line number Diff line
@@ -56,30 +56,6 @@ Who: Mauro Carvalho Chehab <mchehab@infradead.org> 


---------------------------



What:	old tuner-3036 i2c driver

When:	2.6.28

Why:	This driver is for VERY old i2c-over-parallel port teletext receiver

	boxes. Rather then spending effort on converting this driver to V4L2,

	and since it is extremely unlikely that anyone still uses one of these

	devices, it was decided to drop it.

Who:	Hans Verkuil <hverkuil@xs4all.nl>

	Mauro Carvalho Chehab <mchehab@infradead.org>



 ---------------------------



What:   V4L2 dpc7146 driver

When:   2.6.28

Why:    Old driver for the dpc7146 demonstration board that is no longer

	relevant. The last time this was tested on actual hardware was

	probably around 2002. Since this is a driver for a demonstration

	board the decision was made to remove it rather than spending a

	lot of effort continually updating this driver to stay in sync

	with the latest internal V4L2 or I2C API.

Who:    Hans Verkuil <hverkuil@xs4all.nl>

	Mauro Carvalho Chehab <mchehab@infradead.org>



---------------------------



What:	PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])

When:	November 2005

Files:	drivers/pcmcia/: pcmcia_ioctl.c

Documentation/video4linux/README.cx88

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ audio 
	  sound card) should be possible, but there is no code yet ...



vbi

	- some code present.  Doesn't crash any more, but also doesn't

	  work yet ...

	- Code present. Works for NTSC closed caption. PAL and other

	  TV norms may or may not work.





how to add support for new cards

Documentation/video4linux/si470x.txt

0 → 100644
+118 −0
Original line number Diff line number Diff line 
Driver for USB radios for the Silicon Labs Si470x FM Radio Receivers



Copyright (c) 2008 Tobias Lorenz <tobias.lorenz@gmx.net>





Information from Silicon Labs

=============================

Silicon Laboratories is the manufacturer of the radio ICs, that nowadays are the

most often used radio receivers in cell phones. Usually they are connected with

I2C. But SiLabs also provides a reference design, which integrates this IC,

together with a small microcontroller C8051F321, to form a USB radio.

Part of this reference design is also a radio application in binary and source

code. The software also contains an automatic firmware upgrade to the most

current version. Information on these can be downloaded here:

http://www.silabs.com/usbradio





Supported ICs

=============

The following ICs have a very similar register set, so that they are or will be

supported somewhen by the driver:

- Si4700: FM radio receiver

- Si4701: FM radio receiver, RDS Support

- Si4702: FM radio receiver

- Si4703: FM radio receiver, RDS Support

- Si4704: FM radio receiver, no external antenna required

- Si4705: FM radio receiver, no external antenna required, RDS support, Dig I/O

- Si4706: Enhanced FM RDS/TMC radio receiver, no external antenna required, RDS

	  Support

- Si4707: Dedicated weather band radio receiver with SAME decoder, RDS Support

- Si4708: Smallest FM receivers

- Si4709: Smallest FM receivers, RDS Support

More information on these can be downloaded here:

http://www.silabs.com/products/mcu/Pages/USBFMRadioRD.aspx





Supported USB devices

=====================

Currently the following USB radios (vendor:product) with the Silicon Labs si470x

chips are known to work:

- 10c4:818a: Silicon Labs USB FM Radio Reference Design

- 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF)

- 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700)





Software

========

Testing is usually done with most application under Debian/testing:

- fmtools - Utility for managing FM tuner cards

- gnomeradio - FM-radio tuner for the GNOME desktop

- gradio - GTK FM radio tuner

- kradio - Comfortable Radio Application for KDE

- radio - ncurses-based radio application



There is also a library libv4l, which can be used. It's going to have a function

for frequency seeking, either by using hardware functionality as in radio-si470x

or by implementing a function as we currently have in every of the mentioned

programs. Somewhen the radio programs should make use of libv4l.



For processing RDS information, there is a project ongoing at:

http://rdsd.berlios.de/



There is currently no project for making TMC sentences human readable.





Audio Listing

=============

USB Audio is provided by the ALSA snd_usb_audio module. It is recommended to

also select SND_USB_AUDIO, as this is required to get sound from the radio. For

listing you have to redirect the sound, for example using one of the following

commands.



If you just want to test audio (very poor quality):

cat /dev/dsp1 > /dev/dsp



If you use OSS try:

sox -2 --endian little -r 96000 -t oss /dev/dsp1 -t oss /dev/dsp



If you use arts try:

arecord -D hw:1,0 -r96000 -c2 -f S16_LE | artsdsp aplay -B -





Module Parameters

=================

After loading the module, you still have access to some of them in the sysfs

mount under /sys/module/radio_si470x/parameters. The contents of read-only files

(0444) are not updated, even if space, band and de are changed using private

video controls. The others are runtime changeable.





Errors

======

Increase tune_timeout, if you often get -EIO errors.



When timed out or band limit is reached, hw_freq_seek returns -EAGAIN.



If you get any errors from snd_usb_audio, please report them to the ALSA people.





Open Issues

===========

V4L minor device allocation and parameter setting is not perfect. A solution is

currently under discussion.



There is an USB interface for downloading/uploading new firmware images. Support

for it can be implemented using the request_firmware interface.



There is a RDS interrupt mode. The driver is already using the same interface

for polling RDS information, but is currently not using the interrupt mode.



There is a LED interface, which can be used to override the LED control

programmed in the firmware. This can be made available using the LED support

functions in the kernel.





Other useful information and links

==================================

http://www.silabs.com/usbradio

MAINTAINERS

+31 −0
Original line number Diff line number Diff line
@@ -1879,6 +1879,37 @@ M: linux-kernel@vger.kernel.org 
W:	http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/

S:	Maintained



GSPCA FINEPIX SUBDRIVER

P:	Frank Zago

M:	frank@zago.net

L:	video4linux-list@redhat.com

S:	Maintained



GSPCA M5602 SUBDRIVER

P:	Erik Andren

M:	erik.andren@gmail.com

L:	video4linux-list@redhat.com

S:	Maintained



GSPCA PAC207 SONIXB SUBDRIVER

P:	Hans de Goede

M:	hdegoede@redhat.com

L:	video4linux-list@redhat.com

S:	Maintained



GSPCA T613 SUBDRIVER

P:	Leandro Costantino

M:	lcostantino@gmail.com

L:	video4linux-list@redhat.com

S:	Maintained



GSPCA USB WEBCAM DRIVER

P:	Jean-Francois Moine

M:	moinejf@free.fr

W:	http://moinejf.free.fr

L:	video4linux-list@redhat.com

S:	Maintained



HARDWARE MONITORING

L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1265,6 +1265,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },