Commit 50d64462 authored by Evgeny Plehov's avatar Evgeny Plehov Committed by Mauro Carvalho Chehab
Browse files

[media] si2168: Si2168-D60 support 



Support for new demod version.

Signed-off-by: default avatarEvgeny Plehov <EvgenyPlehov@ukr.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 105e8442

drivers/media/dvb-frontends/si2168.c

+4 −0
Original line number Diff line number Diff line
@@ -740,6 +740,9 @@ static int si2168_probe(struct i2c_client *client, 
	case SI2168_CHIP_ID_B40:

		dev->firmware_name = SI2168_B40_FIRMWARE;

		break;

	case SI2168_CHIP_ID_D60:

		dev->firmware_name = SI2168_D60_FIRMWARE;

		break;

	default:

		dev_dbg(&client->dev, "unknown chip version Si21%d-%c%c%c\n",

			cmd.args[2], cmd.args[1], cmd.args[3], cmd.args[4]);
@@ -827,3 +830,4 @@ MODULE_LICENSE("GPL"); 
MODULE_FIRMWARE(SI2168_A20_FIRMWARE);

MODULE_FIRMWARE(SI2168_A30_FIRMWARE);

MODULE_FIRMWARE(SI2168_B40_FIRMWARE);

MODULE_FIRMWARE(SI2168_D60_FIRMWARE);

drivers/media/dvb-frontends/si2168_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#define SI2168_A20_FIRMWARE "dvb-demod-si2168-a20-01.fw"

#define SI2168_A30_FIRMWARE "dvb-demod-si2168-a30-01.fw"

#define SI2168_B40_FIRMWARE "dvb-demod-si2168-b40-01.fw"

#define SI2168_D60_FIRMWARE "dvb-demod-si2168-d60-01.fw"

#define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-02.fw"



/* state struct */
@@ -38,6 +39,7 @@ struct si2168_dev { 
	#define SI2168_CHIP_ID_A20 ('A' << 24 | 68 << 16 | '2' << 8 | '0' << 0)

	#define SI2168_CHIP_ID_A30 ('A' << 24 | 68 << 16 | '3' << 8 | '0' << 0)

	#define SI2168_CHIP_ID_B40 ('B' << 24 | 68 << 16 | '4' << 8 | '0' << 0)

	#define SI2168_CHIP_ID_D60 ('D' << 24 | 68 << 16 | '6' << 8 | '0' << 0)

	unsigned int chip_id;

	unsigned int version;

	const char *firmware_name;