linux-toradex.git/drivers/media/dvb-frontends/rtl2832.c, branch v4.2.2

[media] dvb: Get rid of typedev usage for enums

2015-06-09T20:47:35+00:00

The DVB API was originally defined using typedefs. This is against
Kernel CodingStyle, and there's no good usage here. While we can't
remove its usage on userspace, we can avoid its usage in Kernelspace.

So, let's do it.

This patch was generated by this shell script:

	for j in $(grep typedef include/uapi/linux/dvb/frontend.h |cut -d' ' -f 3); do for i in $(find drivers/media -name '*.[ch]' -type f) $(find drivers/staging/media -name '*.[ch]' -type f); do sed "s,${j}_t,enum $j," <$i >a && mv a $i; done; done

While here, make CodingStyle fixes on the affected lines.

Signed-off-by: Mauro Carvalho Chehab 
Acked-by: Stefan Richter  # for drivers/media/firewire/*

[media] rtl2832: add inittab for FC2580 tuner

2015-05-18T18:55:52+00:00

Add reg/val inittab for FC2580 tuner.

Signed-off-by: Antti Palosaari 
Signed-off-by: Mauro Carvalho Chehab

[media] rtl2832: add support for GoTView MasterHD 3 USB tuner

2015-05-12T16:25:35+00:00

GoTView MasterHD 3 is a DVB-T2/C USB 2.0 tuner.

It's based on the following components:
- USB bridge: RTL2832P (contains also DVB-T demodulator)
- Demodulator: Si2168-A30
- Tuner: Si2148-A20

The demodulator and the tuner will need firmwares. The Si2148 uses Si2158
firmware. Antti has the firmwares available for download:
http://palosaari.fi/linux/v4l-dvb/firmware/

Do note that for DVB-T either of the demodulators can be used. DVB-C and
DVB-T2 are only supported by the Si2168 demodulator. The driver will
register 2 frontends for the same adapter. Frontend 0 will be the RTL2832
demodulator and frontend 1 will be the Si2168 demodulator. The same
tuner is used for both.

As a consequence of the above, it's recommended to use application that
does implement proper DVBv5 support.

For some reason, the old I2C write method sporadically fails. Thus the
need for an option to only use the new I2C write method supported by the
RTL2832.

Signed-off-by: Olli Salonen 
Signed-off-by: Antti Palosaari 
Signed-off-by: Mauro Carvalho Chehab

Merge branch 'patchwork' into v4l_for_linus

2015-04-21T09:12:35+00:00

* patchwork: (404 commits)
  [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
  [media] uvcvideo: fix cropcap v4l2-compliance failure
  [media] media: omap3isp: remove unused clkdev
  [media] coda: Add tracing support
  [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
  [media] coda: fix fill bitstream errors in nonstreaming case
  [media] coda: call SEQ_END when the first queue is stopped
  [media] coda: fail to start streaming if userspace set invalid formats
  [media] coda: remove duplicate error messages for buffer allocations
  [media] coda: move parameter buffer in together with context buffer allocation
  [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
  [media] coda: allocate per-context buffers from REQBUFS
  [media] coda: use strlcpy instead of snprintf
  [media] coda: bitstream payload is unsigned
  [media] coda: fix double call to debugfs_remove
  [media] coda: check kasprintf return value in coda_open
  [media] coda: bitrate can only be set in kbps steps
  [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
  [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
  [media] coda: set allow_zero_bytesused flag for vb2_queue_init
  ...

[media] rtl2832: remove compiler warning

2015-04-08T16:13:36+00:00

Cleaning up the following compiler warning:
rtl2832.c:703:12: warning: 'tmp' may be used uninitialized in this function

Even though it could never happen since if rtl2832_rd_demod_reg () doesn't set
tmp, this line would never run because we go to err. It is still nice to avoid
compiler warnings.

[mchehab@osg.samsung.com: fix a merge conflict with another patch meant
 to fix the same bug, but doing it at the wrong way]
Signed-off-by: Luis de Bethencourt 
Reviewed-by: Antti Palosaari 
Signed-off-by: Mauro Carvalho Chehab

[media] rtl2832: disable regmap register cache

2015-04-02T21:26:45+00:00

Caching register reads causes some random I/O errors on channel
change. Disable caching now in order to avoid those errors.

Reverts partly commit dcadb82

Signed-off-by: Antti Palosaari 
Signed-off-by: Mauro Carvalho Chehab

[media] rtl2832: fix compiler warning

2015-04-02T21:22:54+00:00

>From the daily build:

rtl2832.c: In function 'rtl2832_read_status':
rtl2832.c:703:12: warning: 'tmp' may be used uninitialized in this function [-Wmaybe-uninitialized]
  } else if (tmp == 10) {
            ^

The code is OK, it's just the compiler that cannot figure out what's
going on. So just init 'tmp' to 0.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] rtl2832: declare functions as static

2015-02-03T18:38:43+00:00

drivers/media/dvb-frontends/rtl2832.c:157:5: warning: no previous prototype for ‘rtl2832_bulk_write’ [-Wmissing-prototypes]
 int rtl2832_bulk_write(struct i2c_client *client, unsigned int reg,
     ^
drivers/media/dvb-frontends/rtl2832.c:169:5: warning: no previous prototype for ‘rtl2832_update_bits’ [-Wmissing-prototypes]
 int rtl2832_update_bits(struct i2c_client *client, unsigned int reg,
     ^
drivers/media/dvb-frontends/rtl2832.c:181:5: warning: no previous prototype for ‘rtl2832_bulk_read’ [-Wmissing-prototypes]
 int rtl2832_bulk_read(struct i2c_client *client, unsigned int reg, void *val,

Cc: Antti Palosaari 
Signed-off-by: Mauro Carvalho Chehab

[media] rtl2832: implement own lock for regmap

2015-02-03T18:28:12+00:00

Introduce own lock to silence lockdep warning. lockdep validator
makes wrong decision when two similar (&map->mutex) locks were taken
recursively, even those are different mutexes in a two different
drivers. After that patch, functionality remains same, but mutex names
are different. That is a temporary hack, proper solution is make
regmap aware of locked nested locking rules.

=============================================
[ INFO: possible recursive locking detected ]
3.18.0-rc4+ #4 Tainted: G           O
---------------------------------------------
kdvb-ad-0-fe-0/2814 is trying to acquire lock:
 (&map->mutex){+.+.+.}, at: [] regmap_lock_mutex+0x2f/0x40

but task is already holding lock:
 (&map->mutex){+.+.+.}, at: [] regmap_lock_mutex+0x2f/0x40

other info that might help us debug this:
 Possible unsafe locking scenario:
       CPU0
       ----
  lock(&map->mutex);
  lock(&map->mutex);

 *** DEADLOCK ***
 May be due to missing lock nesting notation
1 lock held by kdvb-ad-0-fe-0/2814:
 #0:  (&map->mutex){+.+.+.}, at: [] regmap_lock_mutex+0x2f/0x40

stack backtrace:
CPU: 3 PID: 2814 Comm: kdvb-ad-0-fe-0 Tainted: G           O 3.18.0-rc4+ #4
Hardware name: System manufacturer System Product Name/M5A78L-M/USB3, BIOS 2001    09/11/2014
 0000000000000000 00000000410c8772 ffff880293af3868 ffffffff817a6f82
 0000000000000000 ffff8800b3462be0 ffff880293af3968 ffffffff810e7f94
 ffff880293af3888 00000000410c8772 ffffffff82dfee60 ffffffff81ab8f89
Call Trace:
 [] dump_stack+0x4e/0x68
 [] __lock_acquire+0x1ea4/0x1f50
 [] ? trace_hardirqs_off+0xd/0x10
 [] ? _raw_spin_lock_irqsave+0x83/0xa0
 [] ? up+0x16/0x50
 [] ? trace_hardirqs_off+0xd/0x10
 [] ? _raw_spin_unlock_irqrestore+0x5f/0x70
 [] lock_acquire+0xc9/0x170
 [] ? regmap_lock_mutex+0x2f/0x40
 [] mutex_lock_nested+0x7e/0x430
 [] ? regmap_lock_mutex+0x2f/0x40
 [] ? regmap_lock_mutex+0x2f/0x40
 [] ? printk+0x70/0x86
 [] ? mod_timer+0x168/0x240
 [] regmap_lock_mutex+0x2f/0x40
 [] regmap_update_bits+0x29/0x60
 [] rtl2832_select+0x38/0x70 [rtl2832]
 [] i2c_mux_master_xfer+0x3d/0x90 [i2c_mux]
 [] __i2c_transfer+0x73/0x2e0
 [] i2c_transfer+0x5a/0xc0
 [] i2c_master_send+0x4e/0x70
 [] regmap_i2c_write+0x1a/0x50 [regmap_i2c]
 [] ? mutex_lock_nested+0x283/0x430
 [] _regmap_raw_write+0x862/0x880
 [] ? regmap_lock_mutex+0x2f/0x40
 [] _regmap_bus_raw_write+0x74/0xa0
 [] _regmap_write+0x92/0x140
 [] regmap_write+0x4b/0x70
 [] ? dvb_frontend_release+0x110/0x110 [dvb_core]
 [] e4000_init+0x34/0x210 [e4000]
 [] dvb_frontend_init+0x59/0xc0 [dvb_core]
 [] ? finish_task_switch+0x80/0x180
 [] ? finish_task_switch+0x42/0x180
 [] dvb_frontend_thread+0x86/0x7b0 [dvb_core]
 [] ? __schedule+0x343/0x930
 [] ? dvb_frontend_release+0x110/0x110 [dvb_core]
 [] kthread+0x10b/0x130
 [] ? sched_clock+0x9/0x10
 [] ? kthread_create_on_node+0x250/0x250
 [] ret_from_fork+0x7c/0xb0
 [] ? kthread_create_on_node+0x250/0x250

Signed-off-by: Antti Palosaari 
Signed-off-by: Mauro Carvalho Chehab

[media] rtl2832: remove internal mux I2C adapter

2015-02-03T18:23:09+00:00

There was 2 muxed I2C adapters, one for demod tuner bus and one for
internal use. Idea of internal I2C adapter was to force I2C repeater
close when demod access its registers. Driver has also delayed work
queue based method to close I2C repeater.

After regmap conversion internal I2C adapter based repeater close
left unused - only work queue method was in use. We could not use
internal mux adapter method with regmap as it makes recursive regmap
call, which causes deadlock as regmap has own locking. Due to that
remove whole method totally.

Signed-off-by: Antti Palosaari 
Signed-off-by: Mauro Carvalho Chehab