Commit ea8f74b1 authored by Erik Andrén's avatar Erik Andrén Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11636): gspca - m5602-ov7660: Design probe function 



Signed-off-by: default avatarErik Andrén <erik.andren@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4763fa84

drivers/media/video/gspca/m5602/m5602_ov7660.c

+61 −0
Original line number Diff line number Diff line
@@ -38,7 +38,68 @@ static void ov7660_dump_registers(struct sd *sd); 


int ov7660_probe(struct sd *sd)

{

	int err = 0, i;

	u8 prod_id = 0, ver_id = 0;



	s32 *sensor_settings;



	if (force_sensor) {

		if (force_sensor == OV7660_SENSOR) {

			info("Forcing an %s sensor", ov7660.name);

			goto sensor_found;

		}

		/* If we want to force another sensor,

		don't try to probe this one */

		return -ENODEV;

	}



	/* Do the preinit */

	for (i = 0; i < ARRAY_SIZE(preinit_ov7660) && !err; i++) {

		u8 data[2];



		if (preinit_ov7660[i][0] == BRIDGE) {

			err = m5602_write_bridge(sd,

				preinit_ov7660[i][1],

				preinit_ov7660[i][2]);

		} else {

			data[0] = preinit_ov7660[i][2];

			err = m5602_write_sensor(sd,

				preinit_ov7660[i][1], data, 1);

		}

	}

	if (err < 0)

		return err;



	if (m5602_read_sensor(sd, OV7660_PID, &prod_id, 1))

		return -ENODEV;



	if (m5602_read_sensor(sd, OV7660_VER, &ver_id, 1))

		return -ENODEV;



	info("Sensor reported 0x%x%x", prod_id, ver_id);



	if ((prod_id == 0x76) && (ver_id == 0x60)) {

		info("Detected a ov7660 sensor");

		goto sensor_found;

	}

	return -ENODEV;



sensor_found:

	sensor_settings = kmalloc(

		ARRAY_SIZE(ov7660_ctrls) * sizeof(s32), GFP_KERNEL);

	if (!sensor_settings)

		return -ENOMEM;



	sd->gspca_dev.cam.cam_mode = ov7660_modes;

	sd->gspca_dev.cam.nmodes = ARRAY_SIZE(ov7660_modes);

	sd->desc->ctrls = ov7660_ctrls;

	sd->desc->nctrls = ARRAY_SIZE(ov7660_ctrls);



	for (i = 0; i < ARRAY_SIZE(ov7660_ctrls); i++)

		sensor_settings[i] = ov7660_ctrls[i].qctrl.default_value;

	sd->sensor_priv = sensor_settings;



	return 0;

}



int ov7660_init(struct sd *sd)

drivers/media/video/gspca/m5602/m5602_ov7660.h

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ 
#define DEFAULT_SATURATION	0x00

#define DEFAULT_EXPOSURE	0x20



/* Kernel module parameters */

extern int force_sensor;

extern int dump_sensor;



int ov7660_probe(struct sd *sd);

int ov7660_init(struct sd *sd);

int ov7660_start(struct sd *sd);

drivers/media/video/gspca/m5602/m5602_sensor.h

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ enum sensors { 
	S5K83A_SENSOR	= 2,

	S5K4AA_SENSOR	= 3,

	MT9M111_SENSOR	= 4,

	PO1030_SENSOR	= 5

	PO1030_SENSOR	= 5,

	OV7660_SENSOR   = 6,

};



/* Enumerates all possible instruction types */