adds webcam for Micron device MT9M111 0x143A to em28xx
PATCH 1/1 adds webcam for Micron device MT9M111 0x143A to em28xx
diff -r d2843f5f8fde linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Tue Aug 11
13:58:54 2009 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Aug 12
15:32:41 2009 -0700
@@ -1797,16 +1797,35 @@ static inline void em28xx_set_model(stru
dev->board.xclk = EM28XX_XCLK_IR_RC5_MODE |
EM28XX_XCLK_FREQUENCY_12MHZ;
if (!dev->board.i2c_speed)
dev->board.i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE |
EM28XX_I2C_FREQ_100_KHZ;}
+
+/* FIXME: Should be replaced by a proper mt9m111 driver */ +static int em28xx_initialize_mt9m111(struct em28xx *dev) +{
+ int i;
+ unsigned char regs[][3] = {
+ { 0x0d, 0x00, 0x01, }, /* reset and use defaults */
+ { 0x0d, 0x00, 0x00, },
+ { 0x0a, 0x00, 0x21, },
+ { 0x21, 0x04, 0x00, }, /* full readout speed, norow/col skipping */
+ };
+
+ for (i = 0; i < ARRAY_SIZE(regs); i++)
+ i2c_master_send(&dev->i2c_client, ®s[i][0], 3);
+
+ return 0;
+}
+
+
/* FIXME: Should be replaced by a proper mt9m001 driver */ static int em28xx_initialize_mt9m001(struct em28xx *dev)
{
int i;
unsigned char regs[][3] = {
{ 0x0d, 0x00, 0x01, },
{ 0x0d, 0x00, 0x00, },
{ 0x04, 0x05, 0x00, }, /* hres = 1280 */
@@ -1825,17 +1844,17 @@ static int em28xx_initialize_mt9m001(str
for (i = 0; i < ARRAY_SIZE(regs); i++)
i2c_master_send(&dev->i2c_client, ®s[i][0], 3);
return 0;}
/* HINT method: webcam I2C chips
*
- * This method work for webcams with Micron sensors
+ * This method works for webcams with Micron sensors */
static int em28xx_hint_sensor(struct em28xx *dev)
{
int rc;
char *sensor_name;
unsigned char cmd;
__be16 version_be;
u16 version;
@@ -1871,16 +1890,33 @@ static int em28xx_hint_sensor(struct em2
dev->board.xclk = EM28XX_XCLK_FREQUENCY_4_3MHZ;
dev->sensor_xtal = 4300000;
/* probably means GRGB 16 bit bayer */
dev->vinmode = 0x0d;
dev->vinctl = 0x00;
break;+
+ case 0x143A: /* MT9M111 as found in the ECS G200 */
+ dev->model = EM2750_BOARD_UNKNOWN;
+ em28xx_set_model(dev);
+
+ sensor_name = "mt9m111"; + dev->board.xclk = EM28XX_XCLK_FREQUENCY_48MHZ; + dev->em28xx_sensor = EM28XX_MT9M111; + em28xx_initialize_mt9m111(dev); + dev->sensor_xres = 640; + dev->sensor_yres = 512;
+
+ dev->vinmode = 0x0A;
+ dev->vinctl = 0x00;
+
+ break;
+
#if 0
case 0x8411:
case 0x8421:
#endif
case 0x8431:
dev->model = EM2750_BOARD_UNKNOWN;
em28xx_set_model(dev);@@ -1891,17 +1927,17 @@ static int em28xx_hint_sensor(struct em2
dev->sensor_yres = 1024;
/* probably means BGGR 16 bit bayer */
dev->vinmode = 0x0c;
dev->vinctl = 0x00;
break;
default:
- printk("Unknown Micron Sensor 0x%04x\n", be16_to_cpu(version));
+ printk("Unknown Micron Sensor 0x%04x\n", version);
return -EINVAL;
}
/* Setup webcam defaults */
em28xx_pre_card_setup(dev);
em28xx_errdev("Sensor is %s, using model %s entry.\n",
sensor_name, em28xx_boards[dev->model].name);linux/drivers/media/video/em28xx/em28xx.h Wed Aug 12 15:32:41 2009 -0700 renamed from linux/drivers/media/video/em28xx/em28xx.h Tue Aug 11 13:58:54 2009 -0300 +1 -0
@@ -363,16 +363,17 @@ enum em28xx_decoder { EM28XX_TVP5150, EM28XX_SAA711X, }; enum em28xx_sensor { EM28XX_NOSENSOR = 0, EM28XX_MT9V011, EM28XX_MT9M001, + EM28XX_MT9M111, }; enum em28xx_adecoder { EM28XX_NOADECODER = 0, EM28XX_TVAUDIO, }; struct em28xx_board {
signed off by: Steve Gotthardt <gotthardt@xxxxxxx>
Quoted 1 line · Steve Gotthardt
+/* FIXME: Should be replaced by a proper mt9m111 driver */
There is one, but only in camera SoC framework.
I think Hans and Guennadi are currently working so that sensor drivers become available as v4l2 subdevices, hence usable by every over host.
Quoted 11 lines
(quoted diff) +10
-0+ case 0x143A: /* MT9M111 as found in the ECS G200 */ + dev->model = EM2750_BOARD_UNKNOWN; + em28xx_set_model(dev); + + sensor_name = "mt9m111"; + dev->board.xclk = EM28XX_XCLK_FREQUENCY_48MHZ; + dev->em28xx_sensor = EM28XX_MT9M111; + em28xx_initialize_mt9m111(dev); + dev->sensor_xres = 640; + dev->sensor_yres = 512;From memory, I can take pictures of resolution 1280x1024 with my mt9m111
chip. Is the 640x512 a special constraint ?
Cheers.
--
Robert