On Tue, 12 Jul 2011, Michael Grzeschik wrote: > added new bit offset defines, > more supported BE colour formats > and also support BGR565 swapped pixel formats > > removed pixfmt helper functions and option flags > setting the configuration register directly in set_pixfmt > > added reg_mask function > > reg_mask is basically the same as clearing & setting registers, > but it is more convenient and faster (saves one rw cycle). > > Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de> > Signed-off-by: Philipp Wiesner <p.wies...@phytec.de>
Applied after pretty heavy modifications. (1) forward-ported to the current tree, (2) removed Bayer swapping, as discussed earlier, (3) removed double bitfield definitions. Please, check out http://git.linuxtv.org/gliakhovetski/v4l-dvb.git?a=shortlog;h=refs/heads/for-3.1 and see, if I haven't inadvertently broken anything. Thanks Guennadi > --- > Changes v1 -> v2 > * removed unrelated OPMODE handling in this function > > Changes v2 -> v3 > * squashed: "[PATCH 04/11] mt9m111: added new bit offset defines" > * squashed: "[PATCH 08/11] mt9m111: added reg_mask function" > Changes v3 -> v4 > * removed wrong formats V4L2_MBUS_FMT_{YVYU8,YUYV8}_2X8_BE > * fixed some return value handling > > drivers/media/video/mt9m111.c | 175 > ++++++++++++++++++----------------------- > 1 files changed, 77 insertions(+), 98 deletions(-) > > diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c > index 8ad99a9..7eb2e4a 100644 > --- a/drivers/media/video/mt9m111.c > +++ b/drivers/media/video/mt9m111.c > @@ -63,6 +63,12 @@ > #define MT9M111_RESET_RESTART_FRAME (1 << 1) > #define MT9M111_RESET_RESET_MODE (1 << 0) > > +#define MT9M111_RM_FULL_POWER_RD (0 << 10) > +#define MT9M111_RM_LOW_POWER_RD (1 << 10) > +#define MT9M111_RM_COL_SKIP_4X (1 << 5) > +#define MT9M111_RM_ROW_SKIP_4X (1 << 4) > +#define MT9M111_RM_COL_SKIP_2X (1 << 3) > +#define MT9M111_RM_ROW_SKIP_2X (1 << 2) > #define MT9M111_RMB_MIRROR_COLS (1 << 1) > #define MT9M111_RMB_MIRROR_ROWS (1 << 0) > #define MT9M111_CTXT_CTRL_RESTART (1 << 15) > @@ -95,7 +101,8 @@ > > #define MT9M111_OPMODE_AUTOEXPO_EN (1 << 14) > #define MT9M111_OPMODE_AUTOWHITEBAL_EN (1 << 1) > - > +#define MT9M111_OUTFMT_FLIP_BAYER_COL (1 << 9) > +#define MT9M111_OUTFMT_FLIP_BAYER_ROW (1 << 8) > #define MT9M111_OUTFMT_PROCESSED_BAYER (1 << 14) > #define MT9M111_OUTFMT_BYPASS_IFP (1 << 10) > #define MT9M111_OUTFMT_INV_PIX_CLOCK (1 << 9) > @@ -113,6 +120,7 @@ > #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) > +#define MT9M111_OUTFMT_SWAP_RGB_R_B (1 << 0) > > /* > * Camera control register addresses (0x200..0x2ff not implemented) > @@ -122,6 +130,8 @@ > #define reg_write(reg, val) mt9m111_reg_write(client, MT9M111_##reg, (val)) > #define reg_set(reg, val) mt9m111_reg_set(client, MT9M111_##reg, (val)) > #define reg_clear(reg, val) mt9m111_reg_clear(client, MT9M111_##reg, (val)) > +#define reg_mask(reg, val, mask) mt9m111_reg_mask(client, MT9M111_##reg, \ > + (val), (mask)) > > #define MT9M111_MIN_DARK_ROWS 8 > #define MT9M111_MIN_DARK_COLS 26 > @@ -153,7 +163,11 @@ static const struct mt9m111_datafmt > mt9m111_colour_fmts[] = { > {V4L2_MBUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG}, > {V4L2_MBUS_FMT_VYUY8_2X8, V4L2_COLORSPACE_JPEG}, > {V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB}, > + {V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB}, > {V4L2_MBUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB}, > + {V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB}, > + {V4L2_MBUS_FMT_BGR565_2X8_LE, V4L2_COLORSPACE_SRGB}, > + {V4L2_MBUS_FMT_BGR565_2X8_BE, V4L2_COLORSPACE_SRGB}, > {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB}, > {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB}, > }; > @@ -177,10 +191,6 @@ struct mt9m111 { > unsigned int powered:1; > unsigned int hflip:1; > unsigned int vflip:1; > - unsigned int swap_rgb_even_odd:1; > - unsigned int swap_rgb_red_blue:1; > - unsigned int swap_yuv_y_chromas:1; > - unsigned int swap_yuv_cb_cr:1; > unsigned int autowhitebalance:1; > }; > > @@ -254,6 +264,17 @@ static int mt9m111_reg_clear(struct i2c_client *client, > const u16 reg, > return ret; > } > > +static int mt9m111_reg_mask(struct i2c_client *client, const u16 reg, > + const u16 data, const u16 mask) > +{ > + int ret = 0; > + > + ret = mt9m111_reg_read(client, reg); > + if (ret >= 0) > + ret = mt9m111_reg_write(client, reg, (ret & ~mask) | data); > + return ret; > +} > + > static int mt9m111_set_context(struct i2c_client *client, > enum mt9m111_context ctxt) > { > @@ -315,78 +336,6 @@ static int mt9m111_setup_rect(struct i2c_client *client, > return ret; > } > > -static int mt9m111_setup_pixfmt(struct i2c_client *client, u16 outfmt) > -{ > - int ret; > - u16 mask = MT9M111_OUTFMT_PROCESSED_BAYER | MT9M111_OUTFMT_RGB | > - MT9M111_OUTFMT_BYPASS_IFP | MT9M111_OUTFMT_SWAP_RGB_EVEN | > - MT9M111_OUTFMT_RGB565 | MT9M111_OUTFMT_RGB555 | > - MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr | > - MT9M111_OUTFMT_SWAP_YCbCr_C_Y; > - > - ret = reg_read(OUTPUT_FORMAT_CTRL2_A); > - if (ret >= 0) > - ret = reg_write(OUTPUT_FORMAT_CTRL2_A, (ret & ~mask) | outfmt); > - if (!ret) > - ret = reg_read(OUTPUT_FORMAT_CTRL2_B); > - if (ret >= 0) > - ret = reg_write(OUTPUT_FORMAT_CTRL2_B, (ret & ~mask) | outfmt); > - > - return ret; > -} > - > -static int mt9m111_setfmt_bayer8(struct i2c_client *client) > -{ > - return mt9m111_setup_pixfmt(client, MT9M111_OUTFMT_PROCESSED_BAYER | > - MT9M111_OUTFMT_RGB); > -} > - > -static int mt9m111_setfmt_bayer10(struct i2c_client *client) > -{ > - return mt9m111_setup_pixfmt(client, MT9M111_OUTFMT_BYPASS_IFP); > -} > - > -static int mt9m111_setfmt_rgb565(struct i2c_client *client) > -{ > - struct mt9m111 *mt9m111 = to_mt9m111(client); > - int val = 0; > - > - if (mt9m111->swap_rgb_red_blue) > - val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr; > - if (mt9m111->swap_rgb_even_odd) > - val |= MT9M111_OUTFMT_SWAP_RGB_EVEN; > - val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565; > - > - return mt9m111_setup_pixfmt(client, val); > -} > - > -static int mt9m111_setfmt_rgb555(struct i2c_client *client) > -{ > - struct mt9m111 *mt9m111 = to_mt9m111(client); > - int val = 0; > - > - if (mt9m111->swap_rgb_red_blue) > - val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr; > - if (mt9m111->swap_rgb_even_odd) > - val |= MT9M111_OUTFMT_SWAP_RGB_EVEN; > - val |= MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555; > - > - return mt9m111_setup_pixfmt(client, val); > -} > - > -static int mt9m111_setfmt_yuv(struct i2c_client *client) > -{ > - struct mt9m111 *mt9m111 = to_mt9m111(client); > - int val = 0; > - > - if (mt9m111->swap_yuv_cb_cr) > - val |= MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr; > - if (mt9m111->swap_yuv_y_chromas) > - val |= MT9M111_OUTFMT_SWAP_YCbCr_C_Y; > - > - return mt9m111_setup_pixfmt(client, val); > -} > - > static int mt9m111_enable(struct i2c_client *client) > { > struct mt9m111 *mt9m111 = to_mt9m111(client); > @@ -514,41 +463,54 @@ static int mt9m111_g_fmt(struct v4l2_subdev *sd, > static int mt9m111_set_pixfmt(struct i2c_client *client, > enum v4l2_mbus_pixelcode code) > { > - struct mt9m111 *mt9m111 = to_mt9m111(client); > - int ret; > + u16 data_outfmt1 = 0, data_outfmt2 = 0, mask_outfmt1, mask_outfmt2; > + int ret = 0; > > switch (code) { > case V4L2_MBUS_FMT_SBGGR8_1X8: > - ret = mt9m111_setfmt_bayer8(client); > + data_outfmt1 = MT9M111_OUTFMT_FLIP_BAYER_ROW; > + data_outfmt2 = MT9M111_OUTFMT_PROCESSED_BAYER | > + MT9M111_OUTFMT_RGB; > break; > case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE: > - ret = mt9m111_setfmt_bayer10(client); > + data_outfmt2 = MT9M111_OUTFMT_BYPASS_IFP | MT9M111_OUTFMT_RGB; > break; > case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE: > - ret = mt9m111_setfmt_rgb555(client); > + data_outfmt2 = MT9M111_OUTFMT_SWAP_RGB_EVEN | > + MT9M111_OUTFMT_RGB | > + MT9M111_OUTFMT_RGB555; > + break; > + case V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE: > + data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555; > break; > case V4L2_MBUS_FMT_RGB565_2X8_LE: > - ret = mt9m111_setfmt_rgb565(client); > + data_outfmt2 = MT9M111_OUTFMT_SWAP_RGB_EVEN | > + MT9M111_OUTFMT_RGB | > + MT9M111_OUTFMT_RGB565; > + break; > + case V4L2_MBUS_FMT_RGB565_2X8_BE: > + data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565; > + break; > + case V4L2_MBUS_FMT_BGR565_2X8_LE: > + data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr | > + MT9M111_OUTFMT_SWAP_RGB_EVEN | > + MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565; > + break; > + case V4L2_MBUS_FMT_BGR565_2X8_BE: > + data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr | > + MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565; > break; > case V4L2_MBUS_FMT_UYVY8_2X8: > - mt9m111->swap_yuv_y_chromas = 0; > - mt9m111->swap_yuv_cb_cr = 0; > - ret = mt9m111_setfmt_yuv(client); > break; > case V4L2_MBUS_FMT_VYUY8_2X8: > - mt9m111->swap_yuv_y_chromas = 0; > - mt9m111->swap_yuv_cb_cr = 1; > - ret = mt9m111_setfmt_yuv(client); > + data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr; > break; > case V4L2_MBUS_FMT_YUYV8_2X8: > - mt9m111->swap_yuv_y_chromas = 1; > - mt9m111->swap_yuv_cb_cr = 0; > - ret = mt9m111_setfmt_yuv(client); > + data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_C_Y; > break; > case V4L2_MBUS_FMT_YVYU8_2X8: > - mt9m111->swap_yuv_y_chromas = 1; > - mt9m111->swap_yuv_cb_cr = 1; > - ret = mt9m111_setfmt_yuv(client); > + data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_C_Y | > + MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr; > break; > default: > dev_err(&client->dev, "Pixel format not handled : %x\n", > @@ -556,6 +518,26 @@ static int mt9m111_set_pixfmt(struct i2c_client *client, > ret = -EINVAL; > } > > + mask_outfmt1 = MT9M111_OUTFMT_FLIP_BAYER_COL | > + MT9M111_OUTFMT_FLIP_BAYER_ROW; > + > + mask_outfmt2 = MT9M111_OUTFMT_PROCESSED_BAYER | > + MT9M111_OUTFMT_BYPASS_IFP | MT9M111_OUTFMT_RGB | > + MT9M111_OUTFMT_RGB565 | MT9M111_OUTFMT_RGB555 | > + MT9M111_OUTFMT_RGB444x | MT9M111_OUTFMT_RGBx444 | > + MT9M111_OUTFMT_SWAP_YCbCr_C_Y | MT9M111_OUTFMT_SWAP_RGB_EVEN | > + MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr | MT9M111_OUTFMT_SWAP_RGB_R_B; > + > + if (!ret) > + ret = reg_mask(OUTPUT_FORMAT_CTRL, data_outfmt1, mask_outfmt1); > + > + if (!ret) > + ret = reg_mask(OUTPUT_FORMAT_CTRL2_A, data_outfmt2, > + mask_outfmt2); > + if (!ret) > + ret = reg_mask(OUTPUT_FORMAT_CTRL2_B, data_outfmt2, > + mask_outfmt2); > + > return ret; > } > > @@ -985,9 +967,6 @@ static int mt9m111_video_probe(struct soc_camera_device > *icd, > mt9m111->autoexposure = 1; > mt9m111->autowhitebalance = 1; > > - mt9m111->swap_rgb_even_odd = 1; > - mt9m111->swap_rgb_red_blue = 1; > - > data = reg_read(CHIP_VERSION); > > switch (data) { > -- > 1.7.5.4 > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
