UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media updates for v5.17-rc1 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+QmuaPwR3wnBdVwACF8+vY7k4RUFAmHeaxgACgkQCF8+vY7k
 4RU8lQ//fZ7PxvYb7MxwtszZXltfWIm9VBEfBxIpTBzbINL2bXlkaJi04CUIBctw
 dN+2+WmRhGUO1nUKJO6xblU8btDKjuOVY/Bij8Ll9KKtDr0ICsFmTNKPSxvz4STV
 DhLCuxfiQBX9+R38aOfVLMpV+pWX2m6QIYcuJFAGNHgtG3F3ZARVj4H5/uxklx95
 gPHb/OPqCA3YLrhH/yJgc4xS2iDl5r9kGvSYCqbDTZ3oNN6S44yrPpmKkgX0Nkh1
 sQb6rQbIJTCw3oiTu1oguLGMpkfS2HPYsIaIpOZF9O74nAv8KglkSGmtrs3+out9
 /JEGn0t3kva16xjG1qcLPptJBtZ5QGrYRe2KMiMXUx9jpSbk85SN+z8JJOStOkhh
 NxwDGFbQESeUbjtI3VD3kcp9hA8mwYHE7J2Nmgl0zF8Wv7B2meLxOfqPpZ7V4lLc
 elNFx6GyC636aTKNIsWzcL/tMqJNBSF7fmmf8ZZJ1owIWvbI4qW7iGQTlesb8z0V
 D0fVdIheshElQRKVx/6wGG5gOVeh4KZJfyGlrDHR5nA99qdWv/3g8+PdALtvRUu6
 bWCZd+tSQDOaiHZzJ06g3vMsE6HS7cizrOkpTuycqFCVIKtE41lqEPN1s2q270PG
 YPzvlC5OSR01utzUKnJbgNOCIEVgIKA7sRPrg/YJ+g4lhE6Vtfw=
 =j92Y
 -----END PGP SIGNATURE-----

Merge tag 'media/v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:

 - some fixes at si2157 tuning logic

 - a warning fix on atomisp when used with clang

* tag 'media/v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: si2157: add support for DVB-C Annex C
  media: si2157: fix bandwidth stored in dev
  media: si2157: fix 6MHz & 6.1MHz bandwidth setting
  media: atomisp: Do not define input_system_cfg2400_t twice
This commit is contained in:
Linus Torvalds 2022-01-12 10:43:08 -08:00
parent 49008f0cc1 8d4ff8187b
commit 2ab9c9675f
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/media/tuners/si2157.c
View File

@ -446,7 +446,8 @@ static int si2157_set_params(struct dvb_frontend *fe)
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret;
struct si2157_cmd cmd;
u8 bandwidth, delivery_system;
u8 bw, delivery_system;
u32 bandwidth;
u32 if_frequency = 5000000;
dev_dbg(&client->dev,
@ -458,18 +459,22 @@ static int si2157_set_params(struct dvb_frontend *fe)
goto err;
}
if (SUPPORTS_1700KHz(dev) && c->bandwidth_hz <= 1700000)
bandwidth = 0x09;
if (c->bandwidth_hz <= 6000000)
bandwidth = 0x06;
if (SUPPORTS_1700KHz(dev) && c->bandwidth_hz <= 6100000)
bandwidth = 0x10;
else if (c->bandwidth_hz <= 7000000)
bandwidth = 0x07;
else if (c->bandwidth_hz <= 8000000)
bandwidth = 0x08;
else
bandwidth = 0x0f;
if (SUPPORTS_1700KHz(dev) && c->bandwidth_hz <= 1700000) {
bandwidth = 1700000;
bw = 9;
} else if (c->bandwidth_hz <= 6000000) {
bandwidth = 6000000;
bw = 6;
} else if (SUPPORTS_1700KHz(dev) && c->bandwidth_hz <= 6100000) {
bandwidth = 6100000;
bw = 10;
} else if (c->bandwidth_hz <= 7000000) {
bandwidth = 7000000;
bw = 7;
} else {
bandwidth = 8000000;
bw = 8;
}
switch (c->delivery_system) {
case SYS_ATSC:
@ -485,6 +490,7 @@ static int si2157_set_params(struct dvb_frontend *fe)
delivery_system = 0x20;
break;
case SYS_DVBC_ANNEX_A:
case SYS_DVBC_ANNEX_C:
delivery_system = 0x30;
break;
case SYS_ISDBT:
@ -499,7 +505,7 @@ static int si2157_set_params(struct dvb_frontend *fe)
}
memcpy(cmd.args, "\x14\x00\x03\x07\x00\x00", 6);
cmd.args[4] = delivery_system | bandwidth;
cmd.args[4] = delivery_system | bw;
if (dev->inversion)
cmd.args[5] = 0x01;
cmd.wlen = 6;

2
drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
View File

@ -29,8 +29,6 @@
#include "isp_acquisition_defs.h"
#include "input_system_ctrl_defs.h"
typedef struct input_system_cfg2400_s input_system_cfg2400_t;
struct target_cfg2400_s {
input_switch_cfg_channel_t input_switch_channel_cfg;
target_isp_cfg_t target_isp_cfg;