Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55bea400 authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files

[media] si2165: Load driver for all hardware revisions 



Current firmware is only for revision D.

Signed-off-by: default avatarMatthias Schwarzott <zzam@gentoo.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1eb96047

drivers/media/dvb-frontends/si2165.c

+17 −9
Original line number Diff line number Diff line
@@ -44,9 +44,7 @@ struct si2165_state { 


	struct si2165_config config;



	/* chip revision */

	u8 revcode;

	/* chip type */

	u8 chip_revcode;

	u8 chip_type;



	/* calculated by xtal and div settings */
@@ -407,7 +405,7 @@ static int si2165_upload_firmware(struct si2165_state *state) 
	int ret;



	const struct firmware *fw = NULL;

	u8 *fw_file = SI2165_FIRMWARE;

	u8 *fw_file;

	const u8 *data;

	u32 len;

	u32 offset;
@@ -415,10 +413,20 @@ static int si2165_upload_firmware(struct si2165_state *state) 
	u8 block_count;

	u16 crc_expected;



	switch (state->chip_revcode) {

	case 0x03: /* revision D */

		fw_file = SI2165_FIRMWARE_REV_D;

		break;

	default:

		dev_info(&state->i2c->dev, "%s: no firmware file for revision=%d\n",

			KBUILD_MODNAME, state->chip_revcode);

		return 0;

	}



	/* request the firmware, this will block and timeout */

	ret = request_firmware(&fw, fw_file, state->i2c->dev.parent);

	if (ret) {

		dev_warn(&state->i2c->dev, "%s: firmare file '%s' not found\n",

		dev_warn(&state->i2c->dev, "%s: firmware file '%s' not found\n",

				KBUILD_MODNAME, fw_file);

		goto error;

	}
@@ -984,7 +992,7 @@ struct dvb_frontend *si2165_attach(const struct si2165_config *config, 
	if (val != state->config.chip_mode)

		goto error;



	io_ret = si2165_readreg8(state, 0x0023 , &state->revcode);

	io_ret = si2165_readreg8(state, 0x0023, &state->chip_revcode);

	if (io_ret < 0)

		goto error;
@@ -998,13 +1006,13 @@ struct dvb_frontend *si2165_attach(const struct si2165_config *config, 
		goto error;



	dev_info(&state->i2c->dev, "%s: hardware revision 0x%02x, chip type 0x%02x\n",

		 KBUILD_MODNAME, state->revcode, state->chip_type);

		 KBUILD_MODNAME, state->chip_revcode, state->chip_type);



	/* It is a guess that register 0x0118 (chip type?) can be used to

	 * differ between si2161, si2163 and si2165

	 * Only si2165 has been tested.

	 */

	if (state->revcode == 0x03 && state->chip_type == 0x07) {

	if (state->chip_type == 0x07) {

		state->has_dvbt = true;

		state->has_dvbc = true;

	} else {
@@ -1037,4 +1045,4 @@ MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); 
MODULE_DESCRIPTION("Silicon Labs Si2165 DVB-C/-T Demodulator driver");

MODULE_AUTHOR("Matthias Schwarzott <zzam@gentoo.org>");

MODULE_LICENSE("GPL");

MODULE_FIRMWARE(SI2165_FIRMWARE);
 
MODULE_FIRMWARE(SI2165_FIRMWARE_REV_D);

drivers/media/dvb-frontends/si2165_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
#ifndef _DVB_SI2165_PRIV

#define _DVB_SI2165_PRIV



#define SI2165_FIRMWARE "dvb-demod-si2165.fw"

#define SI2165_FIRMWARE_REV_D "dvb-demod-si2165.fw"



#endif /* _DVB_SI2165_PRIV */