Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (94 commits)
  V4L/DVB: tvp7002: fix write to H-PLL Feedback Divider LSB register
  V4L/DVB: dvb: siano: free spinlock before schedule()
  V4L/DVB: media: video: pvrusb2: remove custom hex_to_bin()
  V4L/DVB: drivers: usbvideo: remove custom implementation of hex_to_bin()
  V4L/DVB: Report supported QAM modes on bt8xx
  V4L/DVB: media: ir-keytable: null dereference in debug code
  V4L/DVB: ivtv: convert to the new control framework
  V4L/DVB: ivtv: convert gpio subdev to new control framework
  V4L/DVB: wm8739: convert to the new control framework
  V4L/DVB: cs53l32a: convert to new control framework
  V4L/DVB: wm8775: convert to the new control framework
  V4L/DVB: cx2341x: convert to the control framework
  V4L/DVB: cx25840: convert to the new control framework
  V4L/DVB: cx25840/ivtv: replace ugly priv control with s_config
  V4L/DVB: saa717x: convert to the new control framework
  V4L/DVB: msp3400: convert to the new control framework
  V4L/DVB: saa7115: convert to the new control framework
  V4L/DVB: v4l2: hook up the new control framework into the core framework
  V4L/DVB: Documentation: add v4l2-controls.txt documenting the new controls API
  V4L/DVB: v4l2-ctrls: Whitespace cleanups
  ...

1 files changed, 23 insertions, 17 deletions

diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
index 31cc3d04bcc4..758a4db27d65 100644
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@ -1,5 +1,5 @@
 /*
- * Driver for MT9M111/MT9M112 CMOS Image Sensor from Micron
+ * Driver for MT9M111/MT9M112/MT9M131 CMOS Image Sensor from Micron/Aptina
  *
  * Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
  *
@@ -19,11 +19,14 @@
 #include <media/soc_camera.h>
 
 /*
- * mt9m111 and mt9m112 i2c address is 0x5d or 0x48 (depending on SAddr pin)
+ * MT9M111, MT9M112 and MT9M131:
+ * i2c address is 0x48 or 0x5d (depending on SADDR pin)
  * The platform has to define i2c_board_info and call i2c_register_board_info()
  */
 
-/* mt9m111: Sensor register addresses */
+/*
+ * Sensor core register addresses (0x000..0x0ff)
+ */
 #define MT9M111_CHIP_VERSION            0x000
 #define MT9M111_ROW_START               0x001
 #define MT9M111_COLUMN_START            0x002
@@ -72,8 +75,9 @@
 #define MT9M111_CTXT_CTRL_LED_FLASH_EN  (1 << 2)
 #define MT9M111_CTXT_CTRL_VBLANK_SEL_B  (1 << 1)
 #define MT9M111_CTXT_CTRL_HBLANK_SEL_B  (1 << 0)
+
 /*
- * mt9m111: Colorpipe register addresses (0x100..0x1ff)
+ * Colorpipe register addresses (0x100..0x1ff)
  */
 #define MT9M111_OPER_MODE_CTRL          0x106
 #define MT9M111_OUTPUT_FORMAT_CTRL      0x108
@@ -109,8 +113,9 @@
 #define MT9M111_OUTFMT_SWAP_YCbCr_C_Y   (1 << 1)
 #define MT9M111_OUTFMT_SWAP_RGB_EVEN    (1 << 1)
 #define MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr (1 << 0)
+
 /*
- * mt9m111: Camera control register addresses (0x200..0x2ff not implemented)
+ * Camera control register addresses (0x200..0x2ff not implemented)
  */
 
 #define reg_read(reg) mt9m111_reg_read(client, MT9M111_##reg)
@@ -160,7 +165,8 @@ enum mt9m111_context {
 
 struct mt9m111 {
         struct v4l2_subdev subdev;
-        int model;      /* V4L2_IDENT_MT9M11x* codes from v4l2-chip-ident.h */
+        int model;      /* V4L2_IDENT_MT9M111 or V4L2_IDENT_MT9M112 code
+                         * from v4l2-chip-ident.h */
         enum mt9m111_context context;
         struct v4l2_rect rect;
         const struct mt9m111_datafmt *fmt;
@@ -934,7 +940,7 @@ static int mt9m111_init(struct i2c_client *client)
         if (!ret)
                 ret = mt9m111_set_autoexposure(client, mt9m111->autoexposure);
         if (ret)
-                dev_err(&client->dev, "mt9m11x init failed: %d\n", ret);
+                dev_err(&client->dev, "mt9m111 init failed: %d\n", ret);
         return ret;
 }
 
@@ -963,27 +969,27 @@ static int mt9m111_video_probe(struct soc_camera_device *icd,
         mt9m111->swap_rgb_even_odd = 1;
         mt9m111->swap_rgb_red_blue = 1;
 
-        ret = mt9m111_init(client);
-        if (ret)
-                goto ei2c;
-
         data = reg_read(CHIP_VERSION);
 
         switch (data) {
-        case 0x143a: /* MT9M111 */
+        case 0x143a: /* MT9M111 or MT9M131 */
                 mt9m111->model = V4L2_IDENT_MT9M111;
+                dev_info(&client->dev,
+                        "Detected a MT9M111/MT9M131 chip ID %x\n", data);
                 break;
         case 0x148c: /* MT9M112 */
                 mt9m111->model = V4L2_IDENT_MT9M112;
+                dev_info(&client->dev, "Detected a MT9M112 chip ID %x\n", data);
                 break;
         default:
                 ret = -ENODEV;
                 dev_err(&client->dev,
-                        "No MT9M11x chip detected, register read %x\n", data);
+                        "No MT9M111/MT9M112/MT9M131 chip detected register read %x\n",
+                        data);
                 goto ei2c;
         }
 
-        dev_info(&client->dev, "Detected a MT9M11x chip ID %x\n", data);
+        ret = mt9m111_init(client);
 
 ei2c:
         return ret;
@@ -1034,13 +1040,13 @@ static int mt9m111_probe(struct i2c_client *client,
         int ret;
 
         if (!icd) {
-                dev_err(&client->dev, "MT9M11x: missing soc-camera data!\n");
+                dev_err(&client->dev, "mt9m111: soc-camera data missing!\n");
                 return -EINVAL;
         }
 
         icl = to_soc_camera_link(icd);
         if (!icl) {
-                dev_err(&client->dev, "MT9M11x driver needs platform data\n");
+                dev_err(&client->dev, "mt9m111: driver needs platform data\n");
                 return -EINVAL;
         }
 
@@ -1114,6 +1120,6 @@ static void __exit mt9m111_mod_exit(void)
 module_init(mt9m111_mod_init);
 module_exit(mt9m111_mod_exit);
 
-MODULE_DESCRIPTION("Micron MT9M111/MT9M112 Camera driver");
+MODULE_DESCRIPTION("Micron/Aptina MT9M111/MT9M112/MT9M131 Camera driver");
 MODULE_AUTHOR("Robert Jarzmik");
 MODULE_LICENSE("GPL");