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

Commit 5e68f400 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

[media] gspca - sonixj: Move bridge init to sd start 



Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 692e42df

drivers/media/video/gspca/sonixj.c

+129 −136
Original line number Diff line number Diff line
@@ -1755,141 +1755,6 @@ static void po2030n_probe(struct gspca_dev *gspca_dev) 
	}

}



static void bridge_init(struct gspca_dev *gspca_dev,

			  const u8 *sn9c1xx)

{

	struct sd *sd = (struct sd *) gspca_dev;

	u8 reg0102[2];

	const u8 *reg9a;

	static const u8 reg9a_def[] =

		{0x00, 0x40, 0x20, 0x00, 0x00, 0x00};

	static const u8 reg9a_spec[] =

		{0x00, 0x40, 0x38, 0x30, 0x00, 0x20};

	static const u8 regd4[] = {0x60, 0x00, 0x00};



	/* sensor clock already enabled in sd_init */

	/* reg_w1(gspca_dev, 0xf1, 0x00); */

	reg_w1(gspca_dev, 0x01, sn9c1xx[1]);



	/* configure gpio */

	reg0102[0] = sn9c1xx[1];

	reg0102[1] = sn9c1xx[2];

	if (gspca_dev->audio)

		reg0102[1] |= 0x04;	/* keep the audio connection */

	reg_w(gspca_dev, 0x01, reg0102, 2);

	reg_w(gspca_dev, 0x08, &sn9c1xx[8], 2);

	reg_w(gspca_dev, 0x17, &sn9c1xx[0x17], 5);

	switch (sd->sensor) {

	case SENSOR_GC0307:

	case SENSOR_OV7660:

	case SENSOR_PO1030:

	case SENSOR_PO2030N:

	case SENSOR_SOI768:

	case SENSOR_SP80708:

		reg9a = reg9a_spec;

		break;

	default:

		reg9a = reg9a_def;

		break;

	}

	reg_w(gspca_dev, 0x9a, reg9a, 6);



	reg_w(gspca_dev, 0xd4, regd4, sizeof regd4);



	reg_w(gspca_dev, 0x03, &sn9c1xx[3], 0x0f);



	switch (sd->sensor) {

	case SENSOR_ADCM1700:

		reg_w1(gspca_dev, 0x01, 0x43);

		reg_w1(gspca_dev, 0x17, 0x62);

		reg_w1(gspca_dev, 0x01, 0x42);

		reg_w1(gspca_dev, 0x01, 0x42);

		break;

	case SENSOR_GC0307:

		msleep(50);

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0x22);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		msleep(50);

		break;

	case SENSOR_MI0360B:

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0x60);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		break;

	case SENSOR_MT9V111:

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0x61);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		break;

	case SENSOR_OM6802:

		msleep(10);

		reg_w1(gspca_dev, 0x02, 0x73);

		reg_w1(gspca_dev, 0x17, 0x60);

		reg_w1(gspca_dev, 0x01, 0x22);

		msleep(100);

		reg_w1(gspca_dev, 0x01, 0x62);

		reg_w1(gspca_dev, 0x17, 0x64);

		reg_w1(gspca_dev, 0x17, 0x64);

		reg_w1(gspca_dev, 0x01, 0x42);

		msleep(10);

		reg_w1(gspca_dev, 0x01, 0x42);

		i2c_w8(gspca_dev, om6802_init0[0]);

		i2c_w8(gspca_dev, om6802_init0[1]);

		msleep(15);

		reg_w1(gspca_dev, 0x02, 0x71);

		msleep(150);

		break;

	case SENSOR_OV7630:

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0xe2);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		break;

	case SENSOR_OV7648:

		reg_w1(gspca_dev, 0x01, 0x63);

		reg_w1(gspca_dev, 0x17, 0x20);

		reg_w1(gspca_dev, 0x01, 0x62);

		reg_w1(gspca_dev, 0x01, 0x42);

		break;

	case SENSOR_PO1030:

	case SENSOR_SOI768:

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0x20);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		break;

	case SENSOR_PO2030N:

	case SENSOR_OV7660:

		reg_w1(gspca_dev, 0x01, 0x63);

		reg_w1(gspca_dev, 0x17, 0x20);

		reg_w1(gspca_dev, 0x01, 0x62);

		reg_w1(gspca_dev, 0x01, 0x42);

		break;

	case SENSOR_SP80708:

		reg_w1(gspca_dev, 0x01, 0x63);

		reg_w1(gspca_dev, 0x17, 0x20);

		reg_w1(gspca_dev, 0x01, 0x62);

		reg_w1(gspca_dev, 0x01, 0x42);

		msleep(100);

		reg_w1(gspca_dev, 0x02, 0x62);

		break;

	default:

/*	case SENSOR_HV7131R: */

/*	case SENSOR_MI0360: */

/*	case SENSOR_MO4000: */

		reg_w1(gspca_dev, 0x01, 0x43);

		reg_w1(gspca_dev, 0x17, 0x61);

		reg_w1(gspca_dev, 0x01, 0x42);

		if (sd->sensor == SENSOR_HV7131R)

			hv7131r_probe(gspca_dev);

		break;

	}

}



/* this function is called at probe time */

static int sd_config(struct gspca_dev *gspca_dev,

			const struct usb_device_id *id)
@@ -2423,10 +2288,17 @@ static int sd_start(struct gspca_dev *gspca_dev) 
{

	struct sd *sd = (struct sd *) gspca_dev;

	int i;

	u8 reg0102[2];

	const u8 *reg9a;

	u8 reg1, reg17;

	const u8 *sn9c1xx;

	const u8 (*init)[8];

	int mode;

	static const u8 reg9a_def[] =

		{0x00, 0x40, 0x20, 0x00, 0x00, 0x00};

	static const u8 reg9a_spec[] =

		{0x00, 0x40, 0x38, 0x30, 0x00, 0x20};

	static const u8 regd4[] = {0x60, 0x00, 0x00};

	static const u8 C0[] = { 0x2d, 0x2d, 0x3a, 0x05, 0x04, 0x3f };

	static const u8 CA[] = { 0x28, 0xd8, 0x14, 0xec };

	static const u8 CA_adcm1700[] =
@@ -2448,7 +2320,128 @@ static int sd_start(struct gspca_dev *gspca_dev) 


	/* initialize the bridge */

	sn9c1xx = sn_tb[sd->sensor];

	bridge_init(gspca_dev, sn9c1xx);



	/* sensor clock already enabled in sd_init */

	/* reg_w1(gspca_dev, 0xf1, 0x00); */

	reg_w1(gspca_dev, 0x01, sn9c1xx[1]);



	/* configure gpio */

	reg0102[0] = sn9c1xx[1];

	reg0102[1] = sn9c1xx[2];

	if (gspca_dev->audio)

		reg0102[1] |= 0x04;	/* keep the audio connection */

	reg_w(gspca_dev, 0x01, reg0102, 2);

	reg_w(gspca_dev, 0x08, &sn9c1xx[8], 2);

	reg_w(gspca_dev, 0x17, &sn9c1xx[0x17], 5);

	switch (sd->sensor) {

	case SENSOR_GC0307:

	case SENSOR_OV7660:

	case SENSOR_PO1030:

	case SENSOR_PO2030N:

	case SENSOR_SOI768:

	case SENSOR_SP80708:

		reg9a = reg9a_spec;

		break;

	default:

		reg9a = reg9a_def;

		break;

	}

	reg_w(gspca_dev, 0x9a, reg9a, 6);



	reg_w(gspca_dev, 0xd4, regd4, sizeof regd4);



	reg_w(gspca_dev, 0x03, &sn9c1xx[3], 0x0f);



	switch (sd->sensor) {

	case SENSOR_ADCM1700:

		reg_w1(gspca_dev, 0x01, 0x43);

		reg_w1(gspca_dev, 0x17, 0x62);

		reg_w1(gspca_dev, 0x01, 0x42);

		reg_w1(gspca_dev, 0x01, 0x42);

		break;

	case SENSOR_GC0307:

		msleep(50);

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0x22);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		msleep(50);

		break;

	case SENSOR_MI0360B:

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0x60);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		break;

	case SENSOR_MT9V111:

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0x61);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		break;

	case SENSOR_OM6802:

		msleep(10);

		reg_w1(gspca_dev, 0x02, 0x73);

		reg_w1(gspca_dev, 0x17, 0x60);

		reg_w1(gspca_dev, 0x01, 0x22);

		msleep(100);

		reg_w1(gspca_dev, 0x01, 0x62);

		reg_w1(gspca_dev, 0x17, 0x64);

		reg_w1(gspca_dev, 0x17, 0x64);

		reg_w1(gspca_dev, 0x01, 0x42);

		msleep(10);

		reg_w1(gspca_dev, 0x01, 0x42);

		i2c_w8(gspca_dev, om6802_init0[0]);

		i2c_w8(gspca_dev, om6802_init0[1]);

		msleep(15);

		reg_w1(gspca_dev, 0x02, 0x71);

		msleep(150);

		break;

	case SENSOR_OV7630:

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0xe2);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		break;

	case SENSOR_OV7648:

		reg_w1(gspca_dev, 0x01, 0x63);

		reg_w1(gspca_dev, 0x17, 0x20);

		reg_w1(gspca_dev, 0x01, 0x62);

		reg_w1(gspca_dev, 0x01, 0x42);

		break;

	case SENSOR_PO1030:

	case SENSOR_SOI768:

		reg_w1(gspca_dev, 0x01, 0x61);

		reg_w1(gspca_dev, 0x17, 0x20);

		reg_w1(gspca_dev, 0x01, 0x60);

		reg_w1(gspca_dev, 0x01, 0x40);

		break;

	case SENSOR_PO2030N:

	case SENSOR_OV7660:

		reg_w1(gspca_dev, 0x01, 0x63);

		reg_w1(gspca_dev, 0x17, 0x20);

		reg_w1(gspca_dev, 0x01, 0x62);

		reg_w1(gspca_dev, 0x01, 0x42);

		break;

	case SENSOR_SP80708:

		reg_w1(gspca_dev, 0x01, 0x63);

		reg_w1(gspca_dev, 0x17, 0x20);

		reg_w1(gspca_dev, 0x01, 0x62);

		reg_w1(gspca_dev, 0x01, 0x42);

		msleep(100);

		reg_w1(gspca_dev, 0x02, 0x62);

		break;

	default:

/*	case SENSOR_HV7131R: */

/*	case SENSOR_MI0360: */

/*	case SENSOR_MO4000: */

		reg_w1(gspca_dev, 0x01, 0x43);

		reg_w1(gspca_dev, 0x17, 0x61);

		reg_w1(gspca_dev, 0x01, 0x42);

		if (sd->sensor == SENSOR_HV7131R)

			hv7131r_probe(gspca_dev);

		break;

	}



	/* initialize the sensor */

	i2c_w_seq(gspca_dev, sensor_init[sd->sensor]);