Commits · 27c039750c8ff1297632e424a4674732cc4c3c70 · Kirill Smelkov / linux

16 Aug, 2015 4 commits

[media] sr030pc30: don't read a new pointer · 27c03975

Mauro Carvalho Chehab authored Aug 11, 2015

sr030pc30_get_fmt() can only succeed if both info->curr_win and
info->curr_fmt are not NULL.

If one of those vars are null, the curent code would call:
	ret = sr030pc30_set_params(sd);

If the curr_win is null, it will return -EINVAL, as it would be
expected. However, if curr_fmt is NULL, the function won't
set it.

The code will then try to read from it:

        mf->code        = info->curr_fmt->code;
        mf->colorspace  = info->curr_fmt->colorspace;

with obviouly won't work.

This got reported by smatch:
	drivers/media/i2c/sr030pc30.c:505 sr030pc30_get_fmt() error: we previously assumed 'info->curr_win' could be null (see line 499)
	drivers/media/i2c/sr030pc30.c:507 sr030pc30_get_fmt() error: we previously assumed 'info->curr_fmt' could be null (see line 499)
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

27c03975

[media] ov2659: get rid of unused values · ab9a953b

Mauro Carvalho Chehab authored Aug 11, 2015

Why to store the chosed values for prediv, postdiv and mult if
those won't be used?

drivers/media/i2c/ov2659.c: In function 'ov2659_pll_calc_params':
drivers/media/i2c/ov2659.c:912:35: warning: variable 's_mult' set but not used [-Wunused-but-set-variable]
  u32 s_prediv = 1, s_postdiv = 1, s_mult = 1;
                                   ^
drivers/media/i2c/ov2659.c:912:20: warning: variable 's_postdiv' set but not used [-Wunused-but-set-variable]
  u32 s_prediv = 1, s_postdiv = 1, s_mult = 1;
                    ^
drivers/media/i2c/ov2659.c:912:6: warning: variable 's_prediv' set but not used [-Wunused-but-set-variable]
  u32 s_prediv = 1, s_postdiv = 1, s_mult = 1;
      ^

This is likely some leftover from some past change.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

ab9a953b

[media] ov9650: remove an extra space · 12976516

Mauro Carvalho Chehab authored Aug 11, 2015

drivers/media/i2c/ov9650.c:1439 ov965x_detect_sensor() warn: inconsistent indenting
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

12976516

[media] tc358743: don't use variable length array for I2C writes · 1d88f831

Mauro Carvalho Chehab authored Aug 11, 2015

drivers/media/i2c/tc358743.c:148:19: warning: Variable length array is used.

As the maximum size is 1026, we can't use dynamic var, as it
would otherwise spend 1056 bytes of the stack at i2c_wr() function.

So, allocate a buffer with the allowed maximum size together with
the state var.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Mats Randgaard <matrandg@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

1d88f831

11 Aug, 2015 36 commits

[media] c8sectpfe: use a new Kconfig menu for DVB platform drivers · ca051897

Mauro Carvalho Chehab authored Aug 11, 2015

While this is the first DVB platform drivers, let's keep the
Kconfig options well organized, adding it on its own DVB menu.

Of course, it should depend on MEDIA_DIGITAL_TV_SUPPORT, as
this enables all DVB-related menus.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

ca051897

[media] tda10071: use div_s64() when dividing a s64 integer · 7d0ddc91
Mauro Carvalho Chehab authored Aug 11, 2015
```
Otherwise, it will break on 32 bits archs.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
```
7d0ddc91

[media] c8sectpfe: fix pinctrl dependencies · 53cc7c90

Mauro Carvalho Chehab authored Aug 11, 2015

compiling on some archs fail with:

drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c:540:8: error: implicit declaration of function ‘pinctrl_select_state’ [-Werror=implicit-function-declaration]
ret = pinctrl_select_state(fei->pinctrl, tsin->pstate);

That's due the need of including pinctrl.h header and because
CONFIG_PINCTRL needs to be true.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

53cc7c90

[media] Staging: media: lirc: use USB API functions rather than constants · 2696f495

Shraddha Barke authored Aug 06, 2015

This patch introduces the use of the function usb_endpoint_type.

The Coccinelle semantic patch that makes these changes is as follows:

@@ struct usb_endpoint_descriptor *epd; @@

- (epd->bmAttributes & \(USB_ENDPOINT_XFERTYPE_MASK\|3\))
+ usb_endpoint_type(epd)
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

2696f495

[media] staging:media:lirc Remove the extra braces in if statement of lirc_imon · 7229f8c1

pradheep authored Aug 03, 2015

This patche removes the extra braces found in
drivers/staging/media/lirc/lirc_imon.c to fix the warning thrown by
checkpatch.pl
Signed-off-by: Pradheep Shrinivasan <pradheep.sh@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

7229f8c1

[media] coda: drop zero payload bitstream buffers · 5473387b

Zahari Doychev authored Aug 03, 2015

The buffers with zero payload are now dumped in coda_fill_bitstream and not
passed to coda_bitstream_queue. This avoids unnecessary fifo addition and
buffer sequence counter increment.
Signed-off-by: Zahari Doychev <zahari.doychev@linux.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

5473387b

[media] staging: media: lirc: Export I2C module alias information · efb4b8b6

Javier Martinez Canillas authored Jul 30, 2015

The I2C core always reports the MODALIAS uevent as "i2c:<client name"
regardless if the driver was matched using the I2C id_table or the
of_match_table. So the driver needs to export the I2C table and this
be built into the module or udev won't have the necessary information
to auto load the correct module when the device is added.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

efb4b8b6

[media] Export I2C module alias information in missing drivers · ed8d1cf0

Javier Martinez Canillas authored Jul 30, 2015

ed8d1cf0

[media] c8sectpfe: don't go past channel_data array · 7612cf97

Mauro Carvalho Chehab authored Aug 11, 2015

As reported by smatch:
	drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c:365 find_channel() error: buffer overflow 'fei->channel_data' 8 <= 63

It seems that a cut-and-paste type of error occurred here:
the channel_data array size is C8SECTPFE_MAX_TSIN_CHAN, and not
C8SECTPFE_MAXCHANNEL.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

7612cf97

[media] c8sectpfe: Allow compiling it with COMPILE_TEST · 409e9eff

Mauro Carvalho Chehab authored Aug 11, 2015

While it won't work, it is good to allow it to build with
COMPILE_TEST, as we can check if other patches would break
compilation for this driver.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

409e9eff

[media] MAINTAINERS: Add c8sectpfe driver directory to STi section · 95d66b16

Peter Griffin authored Jul 30, 2015

Add the new c8sectpfe demux driver to the STi section of the
MAINTAINERS file.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

95d66b16

[media] c8sectpfe: Add Kconfig and Makefile for the driver · 850a3f7d

Peter Griffin authored Jul 30, 2015

This patch adds the Kconfig and Makefile for the c8sectpfe driver
so it will be built. It also selects additional demodulator and tuners
which are required by the supported NIM cards.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

850a3f7d

[media] c8sectpfe: Add c8sectpfe debugfs support · 03ad4776

Peter Griffin authored Jul 30, 2015

Some basic debugfs support to dump the IP registers. Further
statistics could easily be added in the future for example for
each enabled tsin channel we could expose number of corrupt packets
received etc.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

03ad4776

[media] c8sectpfe: Add support for various ST NIM cards · e77a0cbe

Peter Griffin authored Jul 30, 2015

This patch adds support for the following 2 NIM cards: -
1) B2100A (2x stv0367 demods & 2x NXP tda18212 tuners)
2) STV0903-6110NIM (stv0903 demod + 6110 tuner, lnb24)

A NIM card is a cold plugable expansion card which usually
features a demodulator / tuner combination.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

e77a0cbe

[media] c8sectpfe: Add LDVB helper functions · b5e208a6

Peter Griffin authored Jul 30, 2015

These functions are used by the core code for creating the LDVB
devices and adapter.

Addtionally some older SoC's (and potentially newer ones) have different
frontend HW which would allow those devices to be easily supported
in the future by keeping the code specific to the IP separate from the
more generic code.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

b5e208a6

[media] c8sectpfe: STiH407/10 Linux DVB demux support · c5f5d0f9

Peter Griffin authored Jul 30, 2015

This patch adds support for the c8sectpfe input HW found on
STiH407/410 SoC's.

It currently supports the TS input block, memdma engine
and hw PID filtering blocks of the C8SECTPFE subsystem.

The driver creates one LinuxDVB adapter, and a
demux/dvr/frontend set of devices for each tsin channel
which is specificed in the DT. It has been tested with
multiple tsin channels tuned, locked, and grabbing TS
simultaneously.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

c5f5d0f9

[media] ARM: DT: STi: STiH407: Add c8sectpfe LinuxDVB DT node · 5d8877b6

Peter Griffin authored Jul 30, 2015

This patch adds in the required DT node for the c8sectpfe
Linux DVB demux driver which allows the tsin channels
to be used on an upstream kernel.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

5d8877b6

[media] c8sectpfe: Add DT bindings documentation for c8sectpfe driver · 179dd8c0

Peter Griffin authored Jul 30, 2015

This patch adds the DT bindings documentation for the c8sectpfe LinuxDVB
demux driver whose IP is in the STiH407 family silicon SoC's.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

179dd8c0

[media] dvb-pll: Convert struct dvb_pll_desc uses to const · 548146fb

Joe Perches authored Jul 30, 2015

Convert the struct dvb_pll_desc uses to const and
change the "entries" fixed array size from 12 to []

It saves a couple KB overall and remove ~5KB of data.

$ size drivers/media/dvb-frontends/dvb-pll.o*
   text        data     bss     dec     hex filename
   8520        1552    2120   12192    2fa0 drivers/media/dvb-frontends/dvb-pll.o.new
   5624        6363    2120   14107    371b drivers/media/dvb-frontends/dvb-pll.o.old

[PG] Patch taken from https://lkml.org/lkml/2015/6/24/721 with
commit message updated.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Reviewed-by: Michael Ira Krufky <m.krufky@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

548146fb

[media] stv0367: Add support for 16Mhz reference clock · 6930f669

Peter Griffin authored Jul 30, 2015

The B2100A dvb NIM card from ST has 2x stv0367 demodulators
and 2x TDA18212 silicon tuners, with a 16Mhz crystal. To
get this working properly with the upstream driver we need
to add support for the 16Mhz reference clock.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

6930f669

[media] stv0367: Refine i2c error trace to include i2c address · 86a10283

Peter Griffin authored Jul 30, 2015

When using stv0367 demodulator with STi STB platforms,
we can have easily have four or more stv0367 demods running
in the system at one time.

As typically the b2120 reference design ships with a b2004a daughter
board, which can accept two dvb NIM cards, and each b2100A NIM
has 2x stv0367 demods and 2x NXPs tuner on it.

In such circumstances it is useful to print the i2c address
on error messages to know which one is failing due to I2C issues.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

86a10283

[media] ascot2e: don't use variable length arrays · 8853780e

Mauro Carvalho Chehab authored Aug 11, 2015

The Linux stack is short; we need to be able to count the number
of bytes used at stack on each function. So, we don't like to
use variable-length arrays, as complained by smatch:
        drivers/media/dvb-frontends/horus3a.c:57:19: warning: Variable length array is used.

The max usecase of the driver seems to be 10 bytes + 1 for the
register.

So, let's be safe and allocate 11 bytes for the write buffer.
This should be enough to cover all cases. If not, let's print
an error message.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

8853780e

[media] horus3a: don't use variable length arrays · 4aabd916

Mauro Carvalho Chehab authored Aug 11, 2015

The Linux stack is short; we need to be able to count the number
of bytes used at stack on each function. So, we don't like to
use variable-length arrays, as complained by smatch:
	drivers/media/dvb-frontends/horus3a.c:57:19: warning: Variable length array is used.

The max usecase of the driver seems to be 5 bytes + 1 for the
register.

So, let's be safe and allocate 6 bytes for the write buffer.
This should be enough to cover all cases. If not, let's print
an error message.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

4aabd916

[media] cxd2841er: don't use variable length arrays · d13a7b67

Mauro Carvalho Chehab authored Aug 11, 2015

The Linux stack is short; we need to be able to count the number
of bytes used at stack on each function. So, we don't like to
use variable-length arrays, as complained by smatch:

	drivers/media/dvb-frontends/cxd2841er.c:205:19: warning: Variable length array is used.

The max usecase of the driver seems to be 15 bytes + 1 for the
register.

So, let's be safe and allocate 17 bytes for the write buffer.
This should be enough to cover all cases. If not, let's print
an error message.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

d13a7b67

[media] netup_unidvb: NetUP Universal DVB-S/S2/T/T2/C PCI-E card driver · 52b1eaf4

Kozlov Sergey authored Jul 28, 2015

Add NetUP Dual Universal CI PCIe board driver.
The board has
    - two CI slots
    - two I2C adapters
    - SPI master bus for accessing flash memory containing
      FPGA firmware

No changes required.
Signed-off-by: Kozlov Sergey <serjk@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

52b1eaf4

[media] cxd2841er: declare static functions as such · c8946c8d

Mauro Carvalho Chehab authored Aug 11, 2015

drivers/media/dvb-frontends/cxd2841er.c:992:5: warning: no previous prototype for 'cxd2841er_get_carrier_offset_t2' [-Wmissing-prototypes]
 int cxd2841er_get_carrier_offset_t2(
     ^
drivers/media/dvb-frontends/cxd2841er.c:1032:5: warning: no previous prototype for 'cxd2841er_get_carrier_offset_c' [-Wmissing-prototypes]
 int cxd2841er_get_carrier_offset_c(
     ^
drivers/media/dvb-frontends/cxd2841er.c:1360:5: warning: no previous prototype for 'cxd2841er_read_snr_t2' [-Wmissing-prototypes]
 int cxd2841er_read_snr_t2(struct cxd2841er_priv *priv, u32 *snr)
     ^
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

c8946c8d

[media] cxd2841er: Sony CXD2841ER DVB-S/S2/T/T2/C demodulator driver · a6dc60ff

Kozlov Sergey authored Jul 28, 2015

Add DVB-C/T/T2/S/S2 demodulator frontend driver Sony CXD2841ER chip.
Signed-off-by: Kozlov Sergey <serjk@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

a6dc60ff

[media] lnbh25: LNBH25 SEC controller driver · e025273b

Kozlov Sergey authored Jul 28, 2015

Add DVB SEC frontend driver for STM LNBH25PQR chip.

[mchehab@osg.samsung.com: fix merge conflict:
 fe_sec_voltage_t should not be used in kernelspace anymore.
 instead, it should use enum fe_sec_voltage]
Signed-off-by: Kozlov Sergey <serjk@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

e025273b

[media] ascot2e: Sony Ascot2e DVB-C/T/T2 tuner driver · dacf9ce8

Kozlov Sergey authored Jul 28, 2015

Add DVB-T/T2/C frontend driver for Sony Ascot2e (CXD2861ER) chip.
Signed-off-by: Kozlov Sergey <serjk@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

dacf9ce8

[media] horus3a: Sony Horus3A DVB-S/S2 tuner driver · a5d32b35

Kozlov Sergey authored Jul 28, 2015

Add DVB-S/S2 frontend driver for Sony Horus3A (CXD2832AER) chip
Signed-off-by: Kozlov Sergey <serjk@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

a5d32b35

[media] Technisat SkyStar USB HD,(DVB-S/S2) too much URBs for arm devices · 3139f43f

Christian Löpke authored Jul 18, 2015

Using 8 URBs results in a consecutive buffer allocation of too much
memory for some arm devices.
As we use isochronuous transfers the number of URBs can be reduced
without risking data-loss.
Signed-off-by: Christian Loepke <loepke@edfritsch.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

3139f43f

[media] rc-core: improve the lirc protocol reporting · dd6ff6a0

David Härdeman authored Jul 22, 2015

Commit 275ddb40 removed the lirc
"protocol" but kept backwards compatibility by always listing
the protocol as present and enabled. This patch further improves
the logic by only listing the protocol if the lirc module is loaded
(or if lirc is builtin).
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

dd6ff6a0

[media] staging: Drop owner assignment from i2c_driver · f103a9c1

Krzysztof Kozlowski authored Jul 10, 2015

i2c_driver does not need to set an owner because i2c_register_driver()
will set it.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

f103a9c1

[media] staging: iio: Drop owner assignment from i2c_driver · a5354675

Krzysztof Kozlowski authored Jul 10, 2015

i2c_driver does not need to set an owner because i2c_register_driver()
will set it.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

a5354675

[media] staging: media: Drop owner assignment from i2c_driver · acda7cf4

Krzysztof Kozlowski authored Jul 10, 2015

i2c_driver does not need to set an owner because i2c_register_driver()
will set it.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

acda7cf4

[media] Drop owner assignment from i2c_driver · ebf8dce5

Krzysztof Kozlowski authored Jul 10, 2015

i2c_driver does not need to set an owner because i2c_register_driver()
will set it.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

ebf8dce5