openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (10077): mt9m111: add support for mt9m112 since sensors seem identical 

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mike Rapoport 2008-12-18 11:44:15 -03:00 committed by Mauro Carvalho Chehab
parent 9b9fd6c71f
commit d7f83a5106
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/Kconfig
View File

@ -736,10 +736,10 @@ config MT9M001_PCA9536_SWITCH
extender to switch between 8 and 10 bit datawidth modes extender to switch between 8 and 10 bit datawidth modes
config SOC_CAMERA_MT9M111 config SOC_CAMERA_MT9M111
tristate "mt9m111 support" tristate "mt9m111 and mt9m112 support"
depends on SOC_CAMERA && I2C depends on SOC_CAMERA && I2C
help help
This driver supports MT9M111 cameras from Micron This driver supports MT9M111 and MT9M112 cameras from Micron
config SOC_CAMERA_MT9V022 config SOC_CAMERA_MT9V022
tristate "mt9v022 support" tristate "mt9v022 support"

28
drivers/media/video/mt9m111.c
View File

@ -1,5 +1,5 @@
/* /*
* Driver for MT9M111 CMOS Image Sensor from Micron * Driver for MT9M111/MT9M112 CMOS Image Sensor from Micron
* *
* Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr> * Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
* *
@ -19,7 +19,7 @@
#include <media/soc_camera.h> #include <media/soc_camera.h>
/* /*
* mt9m111 i2c address is 0x5d or 0x48 (depending on SAddr pin) * mt9m111 and mt9m112 i2c address is 0x5d or 0x48 (depending on SAddr pin)
* The platform has to define i2c_board_info and call i2c_register_board_info() * The platform has to define i2c_board_info and call i2c_register_board_info()
*/ */
@ -150,7 +150,7 @@ enum mt9m111_context {
struct mt9m111 { struct mt9m111 {
struct i2c_client *client; struct i2c_client *client;
struct soc_camera_device icd; struct soc_camera_device icd;
int model; /* V4L2_IDENT_MT9M111* codes from v4l2-chip-ident.h */ int model; /* V4L2_IDENT_MT9M11x* codes from v4l2-chip-ident.h */
enum mt9m111_context context; enum mt9m111_context context;
unsigned int left, top, width, height; unsigned int left, top, width, height;
u32 pixfmt; u32 pixfmt;
@ -846,7 +846,7 @@ static int mt9m111_init(struct soc_camera_device *icd)
if (!ret) if (!ret)
ret = mt9m111_set_autoexposure(icd, mt9m111->autoexposure); ret = mt9m111_set_autoexposure(icd, mt9m111->autoexposure);
if (ret) if (ret)
dev_err(&icd->dev, "mt9m111 init failed: %d\n", ret); dev_err(&icd->dev, "mt9m11x init failed: %d\n", ret);
return ret; return ret;
} }
@ -856,7 +856,7 @@ static int mt9m111_release(struct soc_camera_device *icd)
ret = mt9m111_disable(icd); ret = mt9m111_disable(icd);
if (ret < 0) if (ret < 0)
dev_err(&icd->dev, "mt9m111 release failed: %d\n", ret); dev_err(&icd->dev, "mt9m11x release failed: %d\n", ret);
return ret; return ret;
} }
@ -889,19 +889,23 @@ static int mt9m111_video_probe(struct soc_camera_device *icd)
data = reg_read(CHIP_VERSION); data = reg_read(CHIP_VERSION);
switch (data) { switch (data) {
case 0x143a: case 0x143a: /* MT9M111 */
mt9m111->model = V4L2_IDENT_MT9M111; mt9m111->model = V4L2_IDENT_MT9M111;
icd->formats = mt9m111_colour_formats; break;
icd->num_formats = ARRAY_SIZE(mt9m111_colour_formats); case 0x148c: /* MT9M112 */
mt9m111->model = V4L2_IDENT_MT9M112;
break; break;
default: default:
ret = -ENODEV; ret = -ENODEV;
dev_err(&icd->dev, dev_err(&icd->dev,
"No MT9M111 chip detected, register read %x\n", data); "No MT9M11x chip detected, register read %x\n", data);
goto ei2c; goto ei2c;
} }
dev_info(&icd->dev, "Detected a MT9M111 chip ID 0x143a\n"); icd->formats = mt9m111_colour_formats;
icd->num_formats = ARRAY_SIZE(mt9m111_colour_formats);
dev_info(&icd->dev, "Detected a MT9M11x chip ID %x\n", data);
ret = soc_camera_video_start(icd); ret = soc_camera_video_start(icd);
if (ret) if (ret)
@ -938,7 +942,7 @@ static int mt9m111_probe(struct i2c_client *client,
int ret; int ret;
if (!icl) { if (!icl) {
dev_err(&client->dev, "MT9M111 driver needs platform data\n"); dev_err(&client->dev, "MT9M11x driver needs platform data\n");
return -EINVAL; return -EINVAL;
} }
@ -1017,6 +1021,6 @@ static void __exit mt9m111_mod_exit(void)
module_init(mt9m111_mod_init); module_init(mt9m111_mod_init);
module_exit(mt9m111_mod_exit); module_exit(mt9m111_mod_exit);
MODULE_DESCRIPTION("Micron MT9M111 Camera driver"); MODULE_DESCRIPTION("Micron MT9M111/MT9M112 Camera driver");
MODULE_AUTHOR("Robert Jarzmik"); MODULE_AUTHOR("Robert Jarzmik");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");