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

Commit 0c32dbd7 authored by Olivier Grenie's avatar Olivier Grenie Committed by Mauro Carvalho Chehab
Browse files

[media] add the support for DiBcom dib8096P 



The purpose of this patch is to support the DiBcom chip dib8096P.

Signed-off-by: default avatarOlivier Grenie <olivier.grenie@dibcom.fr>
Signed-off-by: default avatarPatrick Boettcher <patrick.boettcher@dibcom.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b293f304

drivers/media/dvb/dvb-usb/dib0700_devices.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1279,7 +1279,7 @@ static int stk807x_frontend_attach(struct dvb_usb_adapter *adap) 
	dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);

	dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);





	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,

	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,

				0x80);

				0x80, 0);





	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80,

	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80,

			      &dib807x_dib8000_config[0]);

			      &dib807x_dib8000_config[0]);
@@ -1308,7 +1308,7 @@ static int stk807xpvr_frontend_attach0(struct dvb_usb_adapter *adap) 
	dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);

	dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);





	/* initialize IC 0 */

	/* initialize IC 0 */

	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x22, 0x80);

	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x22, 0x80, 0);





	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80,

	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80,

			      &dib807x_dib8000_config[0]);

			      &dib807x_dib8000_config[0]);
@@ -1319,7 +1319,7 @@ static int stk807xpvr_frontend_attach0(struct dvb_usb_adapter *adap) 
static int stk807xpvr_frontend_attach1(struct dvb_usb_adapter *adap)

static int stk807xpvr_frontend_attach1(struct dvb_usb_adapter *adap)

{

{

	/* initialize IC 1 */

	/* initialize IC 1 */

	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x12, 0x82);

	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x12, 0x82, 0);





	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x82,

	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x82,

			      &dib807x_dib8000_config[1]);

			      &dib807x_dib8000_config[1]);
@@ -1578,7 +1578,7 @@ static int stk809x_frontend_attach(struct dvb_usb_adapter *adap) 
	msleep(10);

	msleep(10);

	dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);

	dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);





	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 18, 0x80);

	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 1, 18, 0x80, 0);





	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80, &dib809x_dib8000_config[0]);

	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80, &dib809x_dib8000_config[0]);
@@ -1629,7 +1629,7 @@ static int nim8096md_frontend_attach(struct dvb_usb_adapter *adap) 
	msleep(20);

	msleep(20);

	dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);

	dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);





	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 2, 18, 0x80);

	dib8000_i2c_enumeration(&adap->dev->i2c_adap, 2, 18, 0x80, 0);





	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80, &dib809x_dib8000_config[0]);

	adap->fe_adap[0].fe = dvb_attach(dib8000_attach, &adap->dev->i2c_adap, 0x80, &dib809x_dib8000_config[0]);

	if (adap->fe_adap[0].fe == NULL)

	if (adap->fe_adap[0].fe == NULL)

drivers/media/dvb/frontends/dib7000p.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -81,13 +81,6 @@ enum dib7000p_power_mode { 
};

};





/* dib7090 specific fonctions */

/* dib7090 specific fonctions */

#define MPEG_ON_DIBTX		1

#define DIV_ON_DIBTX		2

#define ADC_ON_DIBTX		3

#define DEMOUT_ON_HOSTBUS	4

#define DIBTX_ON_HOSTBUS	5

#define MPEG_ON_HOSTBUS		6



static int dib7090_set_output_mode(struct dvb_frontend *fe, int mode);

static int dib7090_set_output_mode(struct dvb_frontend *fe, int mode);

static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff);

static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff);

static void dib7090_setDibTxMux(struct dib7000p_state *state, int mode);

static void dib7090_setDibTxMux(struct dib7000p_state *state, int mode);