Commit e39b8e94 authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab
Browse files

media: ngene: check for CXD2099AR presence before attaching 



Currently, if there's no CXD2099AR attached to any expansion connector of
the ngene hardware, it will complain with this on every module load:

    cxd2099 1-0040: No CXD2099AR detected at 0x40
    cxd2099: probe of 1-0040 failed with error -5
    ngene 0000:02:00.0: CXD2099AR attach failed

This happens due to the logic assuming such hardware is always there and
blindly tries to attach the cxd2099 I2C driver. Rather add a probe
function (in ngene-cards.c with a prototype in ngene.h) to check for
the existence of such hardware before probing, and don't try further if
no CXD2099 was found.

Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ee93340e

drivers/media/pci/ngene/ngene-cards.c

+19 −0
Original line number Diff line number Diff line
@@ -505,6 +505,25 @@ static int port_has_stv0367(struct i2c_adapter *i2c) 
	return 1;

}



int ngene_port_has_cxd2099(struct i2c_adapter *i2c, u8 *type)

{

	u8 val;

	u8 probe[4] = { 0xe0, 0x00, 0x00, 0x00 }, data[4];

	struct i2c_msg msgs[2] = {{ .addr = 0x40,  .flags = 0,

				    .buf  = probe, .len   = 4 },

				  { .addr = 0x40,  .flags = I2C_M_RD,

				    .buf  = data,  .len   = 4 } };

	val = i2c_transfer(i2c, msgs, 2);

	if (val != 2)

		return 0;



	if (data[0] == 0x02 && data[1] == 0x2b && data[3] == 0x43)

		*type = 2;

	else

		*type = 1;

	return 1;

}



static int demod_attach_drxk(struct ngene_channel *chan,

			     struct i2c_adapter *i2c)

{

drivers/media/pci/ngene/ngene-core.c

+14 −0
Original line number Diff line number Diff line
@@ -1589,6 +1589,20 @@ static void cxd_attach(struct ngene *dev) 
		.addr = 0x40,

		.platform_data = &cxd_cfg,

	};

	int ret;

	u8 type;



	/* check for CXD2099AR presence before attaching */

	ret = ngene_port_has_cxd2099(&dev->channel[0].i2c_adapter, &type);

	if (!ret) {

		dev_dbg(pdev, "No CXD2099AR found\n");

		return;

	}



	if (type != 1) {

		dev_warn(pdev, "CXD2099AR is uninitialized!\n");

		return;

	}



	cxd_cfg.en = &ci->en;

drivers/media/pci/ngene/ngene.h

+3 −0
Original line number Diff line number Diff line
@@ -909,6 +909,9 @@ int ngene_command_gpio_set(struct ngene *dev, u8 select, u8 level); 
void set_transfer(struct ngene_channel *chan, int state);

void FillTSBuffer(void *Buffer, int Length, u32 Flags);



/* Provided by ngene-cards.c */

int ngene_port_has_cxd2099(struct i2c_adapter *i2c, u8 *type);



/* Provided by ngene-i2c.c */

int ngene_i2c_init(struct ngene *dev, int dev_nr);