| Message ID | 3148066.V8NoLtYRlU@computer (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/09/2016 02:17 AM, CrazyCat wrote: > Support for new demod version. > > Signed-off-by: CrazyCat <crazycat69@narod.ru> Patch is correct. Could you still use your real name? regards Antti > --- > drivers/media/dvb-frontends/si2168.c | 4 ++++ > drivers/media/dvb-frontends/si2168_priv.h | 2 ++ > 2 files changed, 6 insertions(+) > > diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c > index 20b4a65..28f3bbe 100644 > --- a/drivers/media/dvb-frontends/si2168.c > +++ b/drivers/media/dvb-frontends/si2168.c > @@ -674,6 +674,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]); > @@ -761,3 +764,4 @@ static int si2168_remove(struct i2c_client *client) > MODULE_FIRMWARE(SI2168_A20_FIRMWARE); > MODULE_FIRMWARE(SI2168_A30_FIRMWARE); > MODULE_FIRMWARE(SI2168_B40_FIRMWARE); > +MODULE_FIRMWARE(SI2168_D60_FIRMWARE); > diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h > index 7843ccb..4baa95b 100644 > --- a/drivers/media/dvb-frontends/si2168_priv.h > +++ b/drivers/media/dvb-frontends/si2168_priv.h > @@ -25,6 +25,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 */ > @@ -37,6 +38,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; >
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c index 20b4a65..28f3bbe 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -674,6 +674,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]); @@ -761,3 +764,4 @@ static int si2168_remove(struct i2c_client *client) MODULE_FIRMWARE(SI2168_A20_FIRMWARE); MODULE_FIRMWARE(SI2168_A30_FIRMWARE); MODULE_FIRMWARE(SI2168_B40_FIRMWARE); +MODULE_FIRMWARE(SI2168_D60_FIRMWARE); diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h index 7843ccb..4baa95b 100644 --- a/drivers/media/dvb-frontends/si2168_priv.h +++ b/drivers/media/dvb-frontends/si2168_priv.h @@ -25,6 +25,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 */ @@ -37,6 +38,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;
Support for new demod version. Signed-off-by: CrazyCat <crazycat69@narod.ru> --- drivers/media/dvb-frontends/si2168.c | 4 ++++ drivers/media/dvb-frontends/si2168_priv.h | 2 ++ 2 files changed, 6 insertions(+)