[PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Javier Martin]

This version fixes some cosmetic issues pointed out
by Guennadi.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
---
 drivers/media/video/Kconfig   |    7 +
 drivers/media/video/Makefile  |    1 +
 drivers/media/video/mt9p031.c |  763 +++++++++++++++++++++++++++++++++++++++++
 include/media/mt9p031.h       |   23 ++
 4 files changed, 794 insertions(+), 0 deletions(-)
 create mode 100644 drivers/media/video/mt9p031.c
 create mode 100644 include/media/mt9p031.h

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 00f51dd..5f851f0 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -329,6 +329,13 @@ config VIDEO_OV7670
 	  OV7670 VGA camera.  It currently only works with the M88ALP01
 	  controller.
 
+config VIDEO_MT9P031
+	tristate "Aptina MT9P031 support"
+	depends on I2C && VIDEO_V4L2
+	---help---
+	  This is a Video4Linux2 sensor-level driver for the Aptina
+	  (Micron) mt9p031 5 Mpixel camera.
+
 config VIDEO_MT9V011
 	tristate "Micron mt9v011 sensor support"
 	depends on I2C && VIDEO_V4L2
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index ace5d8b..912b29b 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -65,6 +65,7 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
 obj-$(CONFIG_VIDEO_OV7670) 	+= ov7670.o
 obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
 obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
+obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o
 obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o
 obj-$(CONFIG_VIDEO_SR030PC30)	+= sr030pc30.o
 obj-$(CONFIG_VIDEO_NOON010PC30)	+= noon010pc30.o
diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c
new file mode 100644
index 0000000..36c47df
--- /dev/null
+++ b/drivers/media/video/mt9p031.c
@@ -0,0 +1,763 @@
+/*
+ * Driver for MT9P031 CMOS Image Sensor from Aptina
+ *
+ * Copyright (C) 2011, Javier Martin <javier.martin@vista-silicon.com>
+ *
+ * Copyright (C) 2011, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * Based on the MT9V032 driver and Bastian Hecht's code.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/i2c.h>
+#include <linux/log2.h>
+#include <linux/pm.h>
+#include <linux/slab.h>
+#include <media/v4l2-subdev.h>
+#include <linux/videodev2.h>
+
+#include <media/mt9p031.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-subdev.h>
+#include <media/v4l2-device.h>
+
+#define MT9P031_EXTCLK_FREQ			20000000
+
+#define MT9P031_CHIP_VERSION			0x00
+#define		MT9P031_CHIP_VERSION_VALUE	0x1801
+#define MT9P031_ROW_START			0x01
+#define		MT9P031_ROW_START_MIN		1
+#define		MT9P031_ROW_START_MAX		2004
+#define		MT9P031_ROW_START_DEF		54
+#define MT9P031_COLUMN_START			0x02
+#define		MT9P031_COLUMN_START_MIN	1
+#define		MT9P031_COLUMN_START_MAX	2750
+#define		MT9P031_COLUMN_START_DEF	16
+#define MT9P031_WINDOW_HEIGHT			0x03
+#define		MT9P031_WINDOW_HEIGHT_MIN	2
+#define		MT9P031_WINDOW_HEIGHT_MAX	2003
+#define		MT9P031_WINDOW_HEIGHT_DEF	2003
+#define MT9P031_WINDOW_WIDTH			0x04
+#define		MT9P031_WINDOW_WIDTH_MIN	18
+#define		MT9P031_WINDOW_WIDTH_MAX	2751
+#define		MT9P031_WINDOW_WIDTH_DEF	2751
+#define MT9P031_H_BLANKING			0x05
+#define		MT9P031_H_BLANKING_VALUE	0
+#define MT9P031_V_BLANKING			0x06
+#define		MT9P031_V_BLANKING_VALUE	25
+#define MT9P031_OUTPUT_CONTROL			0x07
+#define		MT9P031_OUTPUT_CONTROL_CEN	2
+#define		MT9P031_OUTPUT_CONTROL_SYN	1
+#define MT9P031_SHUTTER_WIDTH_UPPER		0x08
+#define MT9P031_SHUTTER_WIDTH			0x09
+#define	MT9P031_PLL_CONTROL			0x10
+#define		MT9P031_PLL_CONTROL_PWROFF	0x0050
+#define		MT9P031_PLL_CONTROL_PWRON	0x0051
+#define		MT9P031_PLL_CONTROL_USEPLL	0x0052
+#define	MT9P031_PLL_CONFIG_1			0x11
+#define		MT9P031_PLL_CONFIG_1_M_48MHZ	0x5000
+#define		MT9P031_PLL_CONFIG_1_N_48MHZ	0x05
+#define		MT9P031_PLL_CONFIG_1_M_96MHZ	0x3600
+#define		MT9P031_PLL_CONFIG_1_N_96MHZ	0x05
+#define	MT9P031_PLL_CONFIG_2			0x12
+#define		MT9P031_PLL_CONFIG_2_P1_48MHZ	5
+#define		MT9P031_PLL_CONFIG_2_P1_96MHZ	2
+#define MT9P031_PIXEL_CLOCK_CONTROL		0x0a
+#define MT9P031_FRAME_RESTART			0x0b
+#define MT9P031_SHUTTER_DELAY			0x0c
+#define MT9P031_RST				0x0d
+#define		MT9P031_RST_ENABLE		1
+#define		MT9P031_RST_DISABLE		0
+#define MT9P031_READ_MODE_1			0x1e
+#define MT9P031_READ_MODE_2			0x20
+#define		MT9P031_READ_MODE_2_ROW_MIR	0x8000
+#define		MT9P031_READ_MODE_2_COL_MIR	0x4000
+#define MT9P031_ROW_ADDRESS_MODE		0x22
+#define MT9P031_COLUMN_ADDRESS_MODE		0x23
+#define MT9P031_GLOBAL_GAIN			0x35
+
+struct mt9p031 {
+	struct v4l2_subdev subdev;
+	struct media_pad pad;
+	struct v4l2_rect rect;  /* Sensor window */
+	struct v4l2_mbus_framefmt format;
+	struct mt9p031_platform_data *pdata;
+	struct mutex power_lock; /* lock to protect power_count */
+	int power_count;
+	u16 xskip;
+	u16 yskip;
+	/* cache register values */
+	u16 output_control;
+};
+
+static struct mt9p031 *to_mt9p031(const struct i2c_client *client)
+{
+	return container_of(i2c_get_clientdata(client), struct mt9p031, subdev);
+}
+
+static int reg_read(struct i2c_client *client, const u8 reg)
+{
+	s32 data = i2c_smbus_read_word_data(client, reg);
+	return data < 0 ? data : swab16(data);
+}
+
+static int reg_write(struct i2c_client *client, const u8 reg,
+			const u16 data)
+{
+	return i2c_smbus_write_word_data(client, reg, swab16(data));
+}
+
+static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear,
+					u16 set)
+{
+	struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev);
+	u16 value = (mt9p031->output_control & ~clear) | set;
+	int ret;
+
+	ret = reg_write(client, MT9P031_OUTPUT_CONTROL, value);
+	if (ret < 0)
+		return ret;
+	mt9p031->output_control = value;
+	return 0;
+}
+
+static int mt9p031_reset(struct i2c_client *client)
+{
+	struct mt9p031 *mt9p031 = to_mt9p031(client);
+	int ret;
+
+	/* Disable chip output, synchronous option update */
+	ret = reg_write(client, MT9P031_RST, MT9P031_RST_ENABLE);
+	if (ret < 0)
+		return ret;
+	ret = reg_write(client, MT9P031_RST, MT9P031_RST_DISABLE);
+	if (ret < 0)
+		return ret;
+	return mt9p031_set_output_control(mt9p031,
+					MT9P031_OUTPUT_CONTROL_CEN, 0);
+}
+
+static int mt9p031_power_on(struct mt9p031 *mt9p031)
+{
+	struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev);
+	int ret;
+
+	/* Ensure RESET_BAR is low */
+	if (mt9p031->pdata->reset) {
+		mt9p031->pdata->reset(&mt9p031->subdev, 1);
+		msleep(1);
+	}
+	/* Emable clock */
+	if (mt9p031->pdata->set_xclk)
+		mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_EXTCLK_FREQ);
+	/* Now RESET_BAR must be high */
+	if (mt9p031->pdata->reset) {
+		mt9p031->pdata->reset(&mt9p031->subdev, 0);
+		msleep(1);
+	}
+	/* soft reset */
+	ret = mt9p031_reset(client);
+	if (ret < 0) {
+		dev_err(&client->dev, "Failed to reset the camera\n");
+		return ret;
+	}
+	return 0;
+}
+
+static void mt9p031_power_off(struct mt9p031 *mt9p031)
+{
+	if (mt9p031->pdata->reset) {
+		mt9p031->pdata->reset(&mt9p031->subdev, 1);
+		msleep(1);
+	}
+	if (mt9p031->pdata->set_xclk)
+		mt9p031->pdata->set_xclk(&mt9p031->subdev, 0);
+}
+
+static int mt9p031_enum_mbus_code(struct v4l2_subdev *sd,
+				struct v4l2_subdev_fh *fh,
+				struct v4l2_subdev_mbus_code_enum *code)
+{
+	struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
+
+	if (code->pad || code->index)
+		return -EINVAL;
+
+	code->code = mt9p031->format.code;
+	return 0;
+}
+
+static struct v4l2_mbus_framefmt *mt9p031_get_pad_format(
+	struct mt9p031 *mt9p031,
+	struct v4l2_subdev_fh *fh,
+	unsigned int pad, u32 which)
+{
+	switch (which) {
+	case V4L2_SUBDEV_FORMAT_TRY:
+		return v4l2_subdev_get_try_format(fh, pad);
+	case V4L2_SUBDEV_FORMAT_ACTIVE:
+		return &mt9p031->format;
+	default:
+		return NULL;
+	}
+}
+
+static struct v4l2_rect *mt9p031_get_pad_crop(struct mt9p031 *mt9p031,
+			struct v4l2_subdev_fh *fh, unsigned int pad, u32 which)
+{
+	switch (which) {
+	case V4L2_SUBDEV_FORMAT_TRY:
+		return v4l2_subdev_get_try_crop(fh, pad);
+	case V4L2_SUBDEV_FORMAT_ACTIVE:
+		return &mt9p031->rect;
+	default:
+		return NULL;
+	}
+}
+
+static int mt9p031_get_crop(struct v4l2_subdev *sd,
+				struct v4l2_subdev_fh *fh,
+				struct v4l2_subdev_crop *crop)
+{
+	struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
+	struct v4l2_rect *rect = mt9p031_get_pad_crop(mt9p031, fh, crop->pad,
+							crop->which);
+	if (!rect)
+		return -EINVAL;
+
+	crop->rect = *rect;
+
+	return 0;
+}
+
+static u16 mt9p031_skip_for_crop(s32 source, s32 *target, s32 max_skip)
+{
+	unsigned int skip;
+
+	if (source - source / 4 < *target) {
+		*target = source;
+		return 1;
+	}
+
+	skip = DIV_ROUND_CLOSEST(source, *target);
+	if (skip > max_skip)
+		skip = max_skip;
+	*target = 2 * DIV_ROUND_UP(source, 2 * skip);
+
+	return skip;
+}
+
+static int mt9p031_set_params(struct i2c_client *client,
+				struct v4l2_rect *rect, u16 xskip, u16 yskip)
+{
+	struct mt9p031 *mt9p031 = to_mt9p031(client);
+	int ret;
+	u16 xbin, ybin;
+	const u16 hblank = MT9P031_H_BLANKING_VALUE,
+		vblank = MT9P031_V_BLANKING_VALUE;
+	__s32 left;
+
+	/*
+	 * TODO: Attention! When implementing horizontal flipping, adjust
+	 * alignment according to R2 "Column Start" description in the datasheet
+	 */
+	if (xskip & 1) {
+		xbin = 1;
+		left = rect->left & ~3;
+	} else if (xskip & 2) {
+		xbin = 2;
+		left = rect->left & ~7;
+	} else {
+		xbin = 4;
+		left = rect->left & ~15;
+	}
+	ybin = min(yskip, (u16)4);
+
+	/* Disable register update, reconfigure atomically */
+	ret = mt9p031_set_output_control(mt9p031, 0,
+					MT9P031_OUTPUT_CONTROL_SYN);
+	if (ret < 0)
+		return ret;
+
+	dev_dbg(&client->dev, "skip %u:%u, rect %ux%u@%u:%u\n",
+		xskip, yskip, rect->width, rect->height, rect->left, rect->top);
+
+	/* Blanking and start values - default... */
+	ret = reg_write(client, MT9P031_H_BLANKING, hblank);
+	if (ret < 0)
+		return ret;
+	ret = reg_write(client, MT9P031_V_BLANKING, vblank);
+	if (ret < 0)
+		return ret;
+
+	ret = reg_write(client, MT9P031_COLUMN_ADDRESS_MODE,
+				((xbin - 1) << 4) | (xskip - 1));
+	if (ret < 0)
+		return ret;
+	ret = reg_write(client, MT9P031_ROW_ADDRESS_MODE,
+				((ybin - 1) << 4) | (yskip - 1));
+	if (ret < 0)
+		return ret;
+
+	dev_dbg(&client->dev, "new physical left %u, top %u\n",
+		rect->left, rect->top);
+
+	ret = reg_write(client, MT9P031_COLUMN_START,
+				rect->left);
+	if (ret < 0)
+		return ret;
+	ret = reg_write(client, MT9P031_ROW_START,
+				rect->top);
+	if (ret < 0)
+		return ret;
+
+	ret = reg_write(client, MT9P031_WINDOW_WIDTH,
+				rect->width - 1);
+	if (ret < 0)
+		return ret;
+	ret = reg_write(client, MT9P031_WINDOW_HEIGHT,
+				rect->height - 1);
+	if (ret < 0)
+		return ret;
+
+	/* Re-enable register update, commit all changes */
+	ret = mt9p031_set_output_control(mt9p031,
+					MT9P031_OUTPUT_CONTROL_SYN, 0);
+	if (ret < 0)
+		return ret;
+
+	mt9p031->xskip = xskip;
+	mt9p031->yskip = yskip;
+	return ret;
+}
+
+static int mt9p031_set_crop(struct v4l2_subdev *sd,
+				struct v4l2_subdev_fh *fh,
+				struct v4l2_subdev_crop *crop)
+{
+	struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
+	struct v4l2_mbus_framefmt *f;
+	struct v4l2_rect *c;
+	struct v4l2_rect rect;
+	u16 xskip, yskip;
+	s32 width, height;
+
+	dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u@%u:%u : %u)\n",
+			__func__, crop->rect.width, crop->rect.height,
+			crop->rect.left, crop->rect.top, crop->which);
+
+	/*
+	 * Clamp the crop rectangle boundaries and align them to a multiple of 2
+	 * pixels.
+	 */
+	rect.width = ALIGN(clamp(crop->rect.width,
+				MT9P031_WINDOW_WIDTH_MIN,
+				MT9P031_WINDOW_WIDTH_MAX), 2);
+	rect.height = ALIGN(clamp(crop->rect.height,
+				MT9P031_WINDOW_HEIGHT_MIN,
+				MT9P031_WINDOW_HEIGHT_MAX), 2);
+	rect.left = ALIGN(clamp(crop->rect.left,
+				MT9P031_COLUMN_START_MIN,
+				MT9P031_COLUMN_START_MAX), 2);
+	rect.top = ALIGN(clamp(crop->rect.top,
+				MT9P031_ROW_START_MIN,
+				MT9P031_ROW_START_MAX), 2);
+
+	c = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, crop->which);
+
+	if (rect.width != c->width || rect.height != c->height) {
+		/*
+		 * Reset the output image size if the crop rectangle size has
+		 * been modified.
+		 */
+		f = mt9p031_get_pad_format(mt9p031, fh, crop->pad,
+						crop->which);
+		width = f->width;
+		height = f->height;
+
+		xskip = mt9p031_skip_for_crop(rect.width, &width, 7);
+		yskip = mt9p031_skip_for_crop(rect.height, &height, 8);
+	} else {
+		xskip = mt9p031->xskip;
+		yskip = mt9p031->yskip;
+		f = NULL;
+	}
+	if (f) {
+		f->width = width;
+		f->height = height;
+	}
+
+	*c = rect;
+	crop->rect = rect;
+
+	mt9p031->xskip = xskip;
+	mt9p031->yskip = yskip;
+	mt9p031->rect = *c;
+	return 0;
+}
+
+static int mt9p031_get_format(struct v4l2_subdev *sd,
+				struct v4l2_subdev_fh *fh,
+				struct v4l2_subdev_format *fmt)
+{
+	struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
+
+	fmt->format =
+		*mt9p031_get_pad_format(mt9p031, fh, fmt->pad, fmt->which);
+	return 0;
+}
+
+static u16 mt9p031_skip_for_scale(s32 *source, s32 target,
+					s32 max_skip, s32 max)
+{
+	unsigned int skip;
+
+	if (*source - *source / 4 < target) {
+		*source = target;
+		return 1;
+	}
+
+	skip = min(max, *source + target / 2) / target;
+	if (skip > max_skip)
+		skip = max_skip;
+	*source = target * skip;
+
+	return skip;
+}
+
+static int mt9p031_set_format(struct v4l2_subdev *sd,
+				struct v4l2_subdev_fh *fh,
+				struct v4l2_subdev_format *format)
+{
+	struct v4l2_mbus_framefmt *__format;
+	struct v4l2_rect *__crop, rect;
+	struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
+	unsigned int width;
+	unsigned int height;
+	u16 xskip, yskip;
+
+	__crop = mt9p031_get_pad_crop(mt9p031, fh, format->pad, format->which);
+
+	width = clamp_t(int, ALIGN(format->format.width, 2), 2,
+						MT9P031_WINDOW_WIDTH_MAX);
+	height = clamp_t(int, ALIGN(format->format.height, 2), 2,
+						MT9P031_WINDOW_HEIGHT_MAX);
+
+	rect.width = __crop->width;
+	rect.height = __crop->height;
+
+	xskip = mt9p031_skip_for_scale(&rect.width, width, 7,
+				MT9P031_WINDOW_WIDTH_MAX);
+	if (rect.width + __crop->left > MT9P031_WINDOW_WIDTH_MAX)
+		rect.left = (MT9P031_WINDOW_WIDTH_MAX - rect.width) / 2;
+	else
+		rect.left = __crop->left;
+	yskip = mt9p031_skip_for_scale(&rect.height, height, 8,
+				MT9P031_WINDOW_HEIGHT_MAX);
+	if (rect.height + __crop->top > MT9P031_WINDOW_HEIGHT_MAX)
+		rect.top = (MT9P031_WINDOW_HEIGHT_MAX - rect.height) / 2;
+	else
+		rect.top = __crop->top;
+
+	dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u : %u)\n", __func__,
+		width, height, format->which);
+	if (__crop)
+		*__crop = rect;
+
+	__format = mt9p031_get_pad_format(mt9p031, fh, format->pad,
+						format->which);
+	__format->width = width;
+	__format->height = height;
+	format->format = *__format;
+
+	mt9p031->xskip = xskip;
+	mt9p031->yskip = yskip;
+	mt9p031->rect = *__crop;
+	return 0;
+}
+
+static int mt9p031_pll_enable(struct i2c_client *client)
+{
+	struct mt9p031 *mt9p031 = to_mt9p031(client);
+	int ret;
+
+	ret = reg_write(client, MT9P031_PLL_CONTROL, MT9P031_PLL_CONTROL_PWRON);
+	if (ret < 0)
+		return ret;
+
+	/* Always set the maximum frequency allowed by VDD_IO */
+	if (mt9p031->pdata->vdd_io == MT9P031_VDD_IO_2V8) {
+		ret = reg_write(client, MT9P031_PLL_CONFIG_1,
+			MT9P031_PLL_CONFIG_1_M_96MHZ |
+			MT9P031_PLL_CONFIG_1_N_96MHZ);
+		if (ret < 0)
+			return ret;
+		ret = reg_write(client, MT9P031_PLL_CONFIG_2,
+				MT9P031_PLL_CONFIG_2_P1_96MHZ);
+		if (ret < 0)
+			return ret;
+	} else {
+		ret = reg_write(client, MT9P031_PLL_CONFIG_1,
+			MT9P031_PLL_CONFIG_1_M_48MHZ |
+			MT9P031_PLL_CONFIG_1_N_48MHZ);
+		if (ret < 0)
+			return ret;
+		ret = reg_write(client, MT9P031_PLL_CONFIG_2,
+				MT9P031_PLL_CONFIG_2_P1_48MHZ);
+		if (ret < 0)
+			return ret;
+	}
+	mdelay(1);
+	ret = reg_write(client, MT9P031_PLL_CONTROL,
+			MT9P031_PLL_CONTROL_PWRON |
+			MT9P031_PLL_CONTROL_USEPLL);
+	mdelay(1);
+	return ret;
+}
+
+static inline int mt9p031_pll_disable(struct i2c_client *client)
+{
+	return reg_write(client, MT9P031_PLL_CONTROL,
+			 MT9P031_PLL_CONTROL_PWROFF);
+}
+
+static int mt9p031_s_stream(struct v4l2_subdev *sd, int enable)
+{
+	struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
+	struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev);
+	struct v4l2_rect rect = mt9p031->rect;
+	u16 xskip = mt9p031->xskip;
+	u16 yskip = mt9p031->yskip;
+	int ret;
+
+	if (enable) {
+		ret = mt9p031_set_params(client, &rect, xskip, yskip);
+		if (ret < 0)
+			return ret;
+		/* Switch to master "normal" mode */
+		ret = mt9p031_set_output_control(mt9p031, 0,
+						MT9P031_OUTPUT_CONTROL_CEN);
+		if (ret < 0)
+			return ret;
+		ret = mt9p031_pll_enable(client);
+	} else {
+		/* Stop sensor readout */
+		ret = mt9p031_set_output_control(mt9p031,
+						MT9P031_OUTPUT_CONTROL_CEN, 0);
+		if (ret < 0)
+			return ret;
+		ret = mt9p031_pll_disable(client);
+	}
+	return ret;
+}
+
+static int mt9p031_video_probe(struct i2c_client *client)
+{
+	s32 data;
+
+	/* Read out the chip version register */
+	data = reg_read(client, MT9P031_CHIP_VERSION);
+	if (data != MT9P031_CHIP_VERSION_VALUE) {
+		dev_err(&client->dev,
+			"No MT9P031 chip detected, register read %x\n", data);
+		return -ENODEV;
+	}
+
+	dev_info(&client->dev, "Detected a MT9P031 chip ID %x\n", data);
+
+	return 0;
+}
+
+static int mt9p031_set_power(struct v4l2_subdev *sd, int on)
+{
+	struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
+	int ret = 0;
+
+	mutex_lock(&mt9p031->power_lock);
+
+	/*
+	 * If the power count is modified from 0 to != 0 or from != 0 to 0,
+	 * update the power state.
+	 */
+	if (mt9p031->power_count == !on) {
+		if (on) {
+			ret = mt9p031_power_on(mt9p031);
+			if (ret) {
+				dev_err(mt9p031->subdev.v4l2_dev->dev,
+					"Failed to power on: %d\n", ret);
+				goto out;
+			}
+		} else {
+			mt9p031_power_off(mt9p031);
+		}
+	}
+
+	/* Update the power count. */
+	mt9p031->power_count += on ? 1 : -1;
+	WARN_ON(mt9p031->power_count < 0);
+
+out:
+	mutex_unlock(&mt9p031->power_lock);
+	return ret;
+}
+
+static int mt9p031_registered(struct v4l2_subdev *sd)
+{
+	struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
+	struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev);
+	int ret;
+
+	ret = mt9p031_set_power(&mt9p031->subdev, 1);
+	if (ret) {
+		dev_err(&client->dev,
+			"Failed to power on device: %d\n", ret);
+		return ret;
+	}
+
+	ret = mt9p031_video_probe(client);
+
+	mt9p031_set_power(&mt9p031->subdev, 0);
+
+	return ret;
+}
+
+static int mt9p031_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+{
+	struct mt9p031 *mt9p031;
+	mt9p031 = container_of(sd, struct mt9p031, subdev);
+
+	mt9p031->rect.width     = MT9P031_WINDOW_WIDTH_DEF;
+	mt9p031->rect.height    = MT9P031_WINDOW_HEIGHT_DEF;
+	mt9p031->rect.left      = MT9P031_COLUMN_START_DEF;
+	mt9p031->rect.top       = MT9P031_ROW_START_DEF;
+
+	if (mt9p031->pdata->version == MT9P031_MONOCHROME_VERSION)
+		mt9p031->format.code = V4L2_MBUS_FMT_Y12_1X12;
+	else
+		mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12;
+
+	mt9p031->format.width = MT9P031_WINDOW_WIDTH_DEF;
+	mt9p031->format.height = MT9P031_WINDOW_HEIGHT_DEF;
+	mt9p031->format.field = V4L2_FIELD_NONE;
+	mt9p031->format.colorspace = V4L2_COLORSPACE_SRGB;
+
+	mt9p031->xskip = 1;
+	mt9p031->yskip = 1;
+	return mt9p031_set_power(sd, 1);
+}
+
+static int mt9p031_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+{
+	return mt9p031_set_power(sd, 0);
+}
+
+static struct v4l2_subdev_core_ops mt9p031_subdev_core_ops = {
+	.s_power        = mt9p031_set_power,
+};
+
+static struct v4l2_subdev_video_ops mt9p031_subdev_video_ops = {
+	.s_stream       = mt9p031_s_stream,
+};
+
+static struct v4l2_subdev_pad_ops mt9p031_subdev_pad_ops = {
+	.enum_mbus_code = mt9p031_enum_mbus_code,
+	.get_fmt = mt9p031_get_format,
+	.set_fmt = mt9p031_set_format,
+	.get_crop = mt9p031_get_crop,
+	.set_crop = mt9p031_set_crop,
+};
+
+static struct v4l2_subdev_ops mt9p031_subdev_ops = {
+	.core   = &mt9p031_subdev_core_ops,
+	.video  = &mt9p031_subdev_video_ops,
+	.pad    = &mt9p031_subdev_pad_ops,
+};
+
+static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = {
+	.registered = mt9p031_registered,
+	.open = mt9p031_open,
+	.close = mt9p031_close,
+};
+
+static int mt9p031_probe(struct i2c_client *client,
+				const struct i2c_device_id *did)
+{
+	int ret;
+	struct mt9p031 *mt9p031;
+	struct mt9p031_platform_data *pdata = client->dev.platform_data;
+	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
+
+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) {
+		dev_warn(&adapter->dev,
+			"I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n");
+		return -EIO;
+	}
+
+	mt9p031 = kzalloc(sizeof(struct mt9p031), GFP_KERNEL);
+	if (!mt9p031)
+		return -ENOMEM;
+
+	mutex_init(&mt9p031->power_lock);
+	v4l2_i2c_subdev_init(&mt9p031->subdev, client, &mt9p031_subdev_ops);
+	mt9p031->subdev.internal_ops = &mt9p031_subdev_internal_ops;
+
+	mt9p031->pdata          = pdata;
+
+	mt9p031->pad.flags = MEDIA_PAD_FL_SOURCE;
+	ret = media_entity_init(&mt9p031->subdev.entity, 1, &mt9p031->pad, 0);
+	if (ret)
+		return ret;
+
+	mt9p031->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+
+	return 0;
+}
+
+static int mt9p031_remove(struct i2c_client *client)
+{
+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
+	struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
+
+	v4l2_device_unregister_subdev(sd);
+	media_entity_cleanup(&sd->entity);
+	kfree(mt9p031);
+
+	return 0;
+}
+
+static const struct i2c_device_id mt9p031_id[] = {
+	{ "mt9p031", 0 },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, mt9p031_id);
+
+static struct i2c_driver mt9p031_i2c_driver = {
+	.driver = {
+		.name = "mt9p031",
+	},
+	.probe          = mt9p031_probe,
+	.remove         = mt9p031_remove,
+	.id_table       = mt9p031_id,
+};
+
+static int __init mt9p031_mod_init(void)
+{
+	return i2c_add_driver(&mt9p031_i2c_driver);
+}
+
+static void __exit mt9p031_mod_exit(void)
+{
+	i2c_del_driver(&mt9p031_i2c_driver);
+}
+
+module_init(mt9p031_mod_init);
+module_exit(mt9p031_mod_exit);
+
+MODULE_DESCRIPTION("Aptina MT9P031 Camera driver");
+MODULE_AUTHOR("Bastian Hecht <hechtb@gmail.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h
new file mode 100644
index 0000000..2026b83
--- /dev/null
+++ b/include/media/mt9p031.h
@@ -0,0 +1,23 @@
+#ifndef MT9P031_H
+#define MT9P031_H
+
+struct v4l2_subdev;
+
+enum {
+	MT9P031_COLOR_VERSION,
+	MT9P031_MONOCHROME_VERSION,
+};
+
+enum {
+	MT9P031_VDD_IO_1V8,
+	MT9P031_VDD_IO_2V8,
+};
+
+struct mt9p031_platform_data {
+	int (*set_xclk)(struct v4l2_subdev *subdev, int hz);
+	int (*reset)(struct v4l2_subdev *subdev, int active);
+	int vdd_io; /* MT9P031_VDD_IO_1V8 or MT9P031_VDD_IO_2V8 */
+	int version; /* MT9P031_COLOR_VERSION or MT9P031_MONOCHROME_VERSION */
+};
+
+#endif
-- 
1.7.0.4

[PATCH v7 2/2] Add support for mt9p031 sensor in Beagleboard XM.

[Javier Martin]

Fixes some cosmetic issues pointed out by Guennadi.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
---
 arch/arm/mach-omap2/Makefile                   |    1 +
 arch/arm/mach-omap2/board-omap3beagle-camera.c |   93 ++++++++++++++++++++++++
 arch/arm/mach-omap2/board-omap3beagle.c        |   50 +++++++++++++
 3 files changed, 144 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-omap2/board-omap3beagle-camera.c

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 512b152..05cd983 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -179,6 +179,7 @@ obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o \
 					   hsmmc.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o
 obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o \
+					   board-omap3beagle-camera.o \
 					   hsmmc.o
 obj-$(CONFIG_MACH_DEVKIT8000)     	+= board-devkit8000.o \
                                            hsmmc.o
diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c
new file mode 100644
index 0000000..f68ae6c
--- /dev/null
+++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
@@ -0,0 +1,93 @@
+#include <linux/gpio.h>
+#include <linux/regulator/machine.h>
+
+#include <plat/i2c.h>
+
+#include <media/mt9p031.h>
+#include <asm/mach-types.h>
+#include "devices.h"
+#include "../../../drivers/media/video/omap3isp/isp.h"
+
+#define MT9P031_RESET_GPIO	98
+#define MT9P031_XCLK		ISP_XCLK_A
+
+static struct regulator *reg_1v8, *reg_2v8;
+
+static int beagle_cam_set_xclk(struct v4l2_subdev *subdev, int hz)
+{
+	struct isp_device *isp = v4l2_dev_to_isp_device(subdev->v4l2_dev);
+
+	return isp->platform_cb.set_xclk(isp, hz, MT9P031_XCLK);
+}
+
+static int beagle_cam_reset(struct v4l2_subdev *subdev, int active)
+{
+	/* Set RESET_BAR to !active */
+	gpio_set_value(MT9P031_RESET_GPIO, !active);
+
+	return 0;
+}
+
+static struct mt9p031_platform_data beagle_mt9p031_platform_data = {
+	.set_xclk	= beagle_cam_set_xclk,
+	.reset		= beagle_cam_reset,
+	.vdd_io		= MT9P031_VDD_IO_1V8,
+	.version	= MT9P031_COLOR_VERSION,
+};
+
+static struct i2c_board_info mt9p031_camera_i2c_device = {
+	I2C_BOARD_INFO("mt9p031", 0x48),
+	.platform_data = &beagle_mt9p031_platform_data,
+};
+
+static struct isp_subdev_i2c_board_info mt9p031_camera_subdevs[] = {
+	{
+		.board_info = &mt9p031_camera_i2c_device,
+		.i2c_adapter_id = 2,
+	},
+	{ NULL, 0, },
+};
+
+static struct isp_v4l2_subdevs_group beagle_camera_subdevs[] = {
+	{
+		.subdevs = mt9p031_camera_subdevs,
+		.interface = ISP_INTERFACE_PARALLEL,
+		.bus = {
+			.parallel = {
+				.data_lane_shift = 0,
+				.clk_pol = 1,
+				.bridge = ISPCTRL_PAR_BRIDGE_DISABLE,
+			}
+		},
+	},
+	{ },
+};
+
+static struct isp_platform_data beagle_isp_platform_data = {
+	.subdevs = beagle_camera_subdevs,
+};
+
+static int __init beagle_camera_init(void)
+{
+	if (!machine_is_omap3_beagle() || !cpu_is_omap3630())
+		return 0;
+
+	reg_1v8 = regulator_get(NULL, "cam_1v8");
+	if (IS_ERR(reg_1v8))
+		pr_err("%s: cannot get cam_1v8 regulator\n", __func__);
+	else
+		regulator_enable(reg_1v8);
+
+	reg_2v8 = regulator_get(NULL, "cam_2v8");
+	if (IS_ERR(reg_2v8))
+		pr_err("%s: cannot get cam_2v8 regulator\n", __func__);
+	else
+		regulator_enable(reg_2v8);
+
+	omap_register_i2c_bus(2, 100, NULL, 0);
+	gpio_request(MT9P031_RESET_GPIO, "cam_rst");
+	gpio_direction_output(MT9P031_RESET_GPIO, 0);
+	omap3_init_camera(&beagle_isp_platform_data);
+	return 0;
+}
+late_initcall(beagle_camera_init);
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 33007fd..c14e9d6 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -30,6 +30,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mmc/host.h>
 
+#include <linux/gpio.h>
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
 
@@ -273,6 +274,44 @@ static struct regulator_consumer_supply beagle_vsim_supply = {
 
 static struct gpio_led gpio_leds[];
 
+static struct regulator_consumer_supply beagle_vaux3_supply = {
+	.supply         = "cam_1v8",
+};
+
+static struct regulator_consumer_supply beagle_vaux4_supply = {
+	.supply         = "cam_2v8",
+};
+
+/* VAUX3 for CAM_1V8 */
+static struct regulator_init_data beagle_vaux3 = {
+	.constraints = {
+		.min_uV			= 1800000,
+		.max_uV			= 1800000,
+		.apply_uV		= true,
+		.valid_modes_mask	= REGULATOR_MODE_NORMAL
+					| REGULATOR_MODE_STANDBY,
+		.valid_ops_mask		= REGULATOR_CHANGE_MODE
+					| REGULATOR_CHANGE_STATUS,
+	},
+	.num_consumer_supplies		= 1,
+	.consumer_supplies		= &beagle_vaux3_supply,
+};
+
+/* VAUX4 for CAM_2V8 */
+static struct regulator_init_data beagle_vaux4 = {
+	.constraints = {
+		.min_uV			= 1800000,
+		.max_uV			= 1800000,
+		.apply_uV		= true,
+		.valid_modes_mask	= REGULATOR_MODE_NORMAL
+					| REGULATOR_MODE_STANDBY,
+		.valid_ops_mask		= REGULATOR_CHANGE_MODE
+					| REGULATOR_CHANGE_STATUS,
+	},
+	.num_consumer_supplies  = 1,
+	.consumer_supplies      = &beagle_vaux4_supply,
+};
+
 static int beagle_twl_gpio_setup(struct device *dev,
 		unsigned gpio, unsigned ngpio)
 {
@@ -309,6 +348,15 @@ static int beagle_twl_gpio_setup(struct device *dev,
 			pr_err("%s: unable to configure EHCI_nOC\n", __func__);
 	}
 
+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
+		/*
+		 * Power on camera interface - only on pre-production, not
+		 * needed on production boards
+		 */
+		gpio_request(gpio + 2, "CAM_EN");
+		gpio_direction_output(gpio + 2, 1);
+	}
+
 	/*
 	 * TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, XM active
 	 * high / others active low)
@@ -451,6 +499,8 @@ static struct twl4030_platform_data beagle_twldata = {
 	.vsim		= &beagle_vsim,
 	.vdac		= &beagle_vdac,
 	.vpll2		= &beagle_vpll2,
+	.vaux3          = &beagle_vaux3,
+	.vaux4          = &beagle_vaux4,
 };
 
 static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = {
-- 
1.7.0.4

Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Laurent Pinchart]

Hi Javier,

I'm testing your patch on a 2.6.39 kernel. Here's what I get when loading the 
omap3-isp module.

root@arago:~# modprobe omap3-isp
[  159.523681] omap3isp omap3isp: Revision 15.0 found
[  159.528991] omap-iommu omap-iommu.0: isp: version 1.1
[  159.875701] omap_i2c omap_i2c.2: Arbitration lost
[  159.881622] mt9p031 2-0048: Failed to reset the camera
[  159.887054] omap3isp omap3isp: Failed to power on: -5
[  159.892425] mt9p031 2-0048: Failed to power on device: -5
[  159.898956] isp_register_subdev_group: Unable to register subdev mt9p031

Have you (or anyone else) seen that issue ?

-- 
Regards,

Laurent Pinchart

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Koen Kooi]

Op 8 jun 2011, om 13:57 heeft Laurent Pinchart het volgende geschreven:

> Hi Javier,
> 
> I'm testing your patch on a 2.6.39 kernel. Here's what I get when loading the 
> omap3-isp module.
> 
> root@arago:~# modprobe omap3-isp
> [  159.523681] omap3isp omap3isp: Revision 15.0 found
> [  159.528991] omap-iommu omap-iommu.0: isp: version 1.1
> [  159.875701] omap_i2c omap_i2c.2: Arbitration lost
> [  159.881622] mt9p031 2-0048: Failed to reset the camera
> [  159.887054] omap3isp omap3isp: Failed to power on: -5
> [  159.892425] mt9p031 2-0048: Failed to power on device: -5
> [  159.898956] isp_register_subdev_group: Unable to register subdev mt9p031
> 
> Have you (or anyone else) seen that issue ?

I build in both statically to avoid that problem.

regards,

Koen

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Guennadi Liakhovetski]

On Wed, 8 Jun 2011, Koen Kooi wrote:

> 
> Op 8 jun 2011, om 13:57 heeft Laurent Pinchart het volgende geschreven:
> 
> > Hi Javier,
> > 
> > I'm testing your patch on a 2.6.39 kernel. Here's what I get when loading the 
> > omap3-isp module.
> > 
> > root@arago:~# modprobe omap3-isp
> > [  159.523681] omap3isp omap3isp: Revision 15.0 found
> > [  159.528991] omap-iommu omap-iommu.0: isp: version 1.1
> > [  159.875701] omap_i2c omap_i2c.2: Arbitration lost
> > [  159.881622] mt9p031 2-0048: Failed to reset the camera
> > [  159.887054] omap3isp omap3isp: Failed to power on: -5
> > [  159.892425] mt9p031 2-0048: Failed to power on device: -5
> > [  159.898956] isp_register_subdev_group: Unable to register subdev mt9p031
> > 
> > Have you (or anyone else) seen that issue ?
> 
> I build in both statically to avoid that problem.

I used modules and it worked for me.

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[javier Martin]

On 8 June 2011 14:39, Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote:
> On Wed, 8 Jun 2011, Koen Kooi wrote:
>
>>
>> Op 8 jun 2011, om 13:57 heeft Laurent Pinchart het volgende geschreven:
>>
>> > Hi Javier,
>> >
>> > I'm testing your patch on a 2.6.39 kernel. Here's what I get when loading the
>> > omap3-isp module.
>> >
>> > root@arago:~# modprobe omap3-isp
>> > [  159.523681] omap3isp omap3isp: Revision 15.0 found
>> > [  159.528991] omap-iommu omap-iommu.0: isp: version 1.1
>> > [  159.875701] omap_i2c omap_i2c.2: Arbitration lost
>> > [  159.881622] mt9p031 2-0048: Failed to reset the camera
>> > [  159.887054] omap3isp omap3isp: Failed to power on: -5
>> > [  159.892425] mt9p031 2-0048: Failed to power on device: -5
>> > [  159.898956] isp_register_subdev_group: Unable to register subdev mt9p031
>> >
>> > Have you (or anyone else) seen that issue ?
>>
>> I build in both statically to avoid that problem.
>
> I used modules and it worked for me.

Maybe u-boot version Laurent uses does not enable internal pull-up
resistors for i2c2 interface.
You could either use a different u-boot version or attach external
pull-up resistors to that interface.



-- 
Javier Martin
Vista Silicon S.L.
CDTUC - FASE C - Oficina S-345
Avda de los Castros s/n
39005- Santander. Cantabria. Spain
+34 942 25 32 60
www.vista-silicon.com

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Koen Kooi]

Op 8 jun 2011, om 14:42 heeft javier Martin het volgende geschreven:

> On 8 June 2011 14:39, Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote:
>> On Wed, 8 Jun 2011, Koen Kooi wrote:
>> 
>>> 
>>> Op 8 jun 2011, om 13:57 heeft Laurent Pinchart het volgende geschreven:
>>> 
>>>> Hi Javier,
>>>> 
>>>> I'm testing your patch on a 2.6.39 kernel. Here's what I get when loading the
>>>> omap3-isp module.
>>>> 
>>>> root@arago:~# modprobe omap3-isp
>>>> [  159.523681] omap3isp omap3isp: Revision 15.0 found
>>>> [  159.528991] omap-iommu omap-iommu.0: isp: version 1.1
>>>> [  159.875701] omap_i2c omap_i2c.2: Arbitration lost
>>>> [  159.881622] mt9p031 2-0048: Failed to reset the camera
>>>> [  159.887054] omap3isp omap3isp: Failed to power on: -5
>>>> [  159.892425] mt9p031 2-0048: Failed to power on device: -5
>>>> [  159.898956] isp_register_subdev_group: Unable to register subdev mt9p031
>>>> 
>>>> Have you (or anyone else) seen that issue ?
>>> 
>>> I build in both statically to avoid that problem.
>> 
>> I used modules and it worked for me.
> 
> Maybe u-boot version Laurent uses does not enable internal pull-up
> resistors for i2c2 interface.
> You could either use a different u-boot version or attach external
> pull-up resistors to that interface.

http://dominion.thruhere.net/koen/angstrom/beagleboard/2.6.39/MLO
http://dominion.thruhere.net/koen/angstrom/beagleboard/2.6.39/u-boot.bin

The above MLO and uboot enable the pullups and work will all released versions of the beagleboard.

regards,

Koen

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Laurent Pinchart]

Hi Koen,

On Wednesday 08 June 2011 14:47:13 Koen Kooi wrote:
> Op 8 jun 2011, om 14:42 heeft javier Martin het volgende geschreven:
> > On 8 June 2011 14:39, Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote:
> >> On Wed, 8 Jun 2011, Koen Kooi wrote:
> >>> Op 8 jun 2011, om 13:57 heeft Laurent Pinchart het volgende geschreven:
> >>>> Hi Javier,
> >>>> 
> >>>> I'm testing your patch on a 2.6.39 kernel. Here's what I get when
> >>>> loading the omap3-isp module.
> >>>> 
> >>>> root@arago:~# modprobe omap3-isp
> >>>> [  159.523681] omap3isp omap3isp: Revision 15.0 found
> >>>> [  159.528991] omap-iommu omap-iommu.0: isp: version 1.1
> >>>> [  159.875701] omap_i2c omap_i2c.2: Arbitration lost
> >>>> [  159.881622] mt9p031 2-0048: Failed to reset the camera
> >>>> [  159.887054] omap3isp omap3isp: Failed to power on: -5
> >>>> [  159.892425] mt9p031 2-0048: Failed to power on device: -5
> >>>> [  159.898956] isp_register_subdev_group: Unable to register subdev
> >>>> mt9p031
> >>>> 
> >>>> Have you (or anyone else) seen that issue ?
> >>> 
> >>> I build in both statically to avoid that problem.
> >> 
> >> I used modules and it worked for me.
> > 
> > Maybe u-boot version Laurent uses does not enable internal pull-up
> > resistors for i2c2 interface.
> > You could either use a different u-boot version or attach external
> > pull-up resistors to that interface.
> 
> http://dominion.thruhere.net/koen/angstrom/beagleboard/2.6.39/MLO
> http://dominion.thruhere.net/koen/angstrom/beagleboard/2.6.39/u-boot.bin
> 
> The above MLO and uboot enable the pullups and work will all released
> versions of the beagleboard.

That works much better, thank you.

-- 
Regards,

Laurent Pinchart

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[javier Martin]

On 8 June 2011 18:24, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> That works much better, thank you.
>
> --
> Regards,
>
> Laurent Pinchart
>

So, how is it going?

Are you finally accepting the patches for mainline?

Thank you,

-- 
Javier Martin
Vista Silicon S.L.
CDTUC - FASE C - Oficina S-345
Avda de los Castros s/n
39005- Santander. Cantabria. Spain
+34 942 25 32 60
www.vista-silicon.com

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[javier Martin]

Laurent,
have you been able to successfully test the driver?

I've found some issues and I don't know whether I should send a new
version or just wait for you to mainline the last one and send a patch
later.

-- 
Javier Martin
Vista Silicon S.L.
CDTUC - FASE C - Oficina S-345
Avda de los Castros s/n
39005- Santander. Cantabria. Spain
+34 942 25 32 60
www.vista-silicon.com

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Laurent Pinchart]

Hi Javier,

On Friday 17 June 2011 17:26:26 javier Martin wrote:
> Laurent,
> have you been able to successfully test the driver?
> 
> I've found some issues and I don't know whether I should send a new version
> or just wait for you to mainline the last one and send a patch later.

Sorry for the late reply. I've briefly tested the driver but haven't been able 
to work on it. Please send a new version if you have one (with a description 
of the changes since the previous version). I'll then test that and push it to 
mainline through my tree (with a couple of changes if needed, I'll ask for 
your ack before pushing the driver).

-- 
Regards,

Laurent Pinchart

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[CJ]

Hi,

I am trying to get the mt9p031 working from nand with a ubifs file 
system and I am having a few problems.

/dev/media0 is not present unless I run:
#mknod /dev/media0 c 251 0
#chown root:video /dev/media0

#media-ctl -p
Enumerating entities
media_open: Unable to enumerate entities for device /dev/media0 
(Inappropriate ioctl for device)

With the same rig/files it works fine running from EXT4 on an SD card.
Any idea why this does not work on nand with ubifs?

Regards,
CJ

On 13/06/11 22:39, javier Martin wrote:
> On 8 June 2011 18:24, Laurent Pinchart
> <laurent.pinchart@ideasonboard.com>  wrote:
>> That works much better, thank you.
>>
>> --
>> Regards,
>>
>> Laurent Pinchart
>>
> So, how is it going?
>
> Are you finally accepting the patches for mainline?
>
> Thank you,
>

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Laurent Pinchart]

Hi,

On Friday 19 August 2011 04:13:23 CJ wrote:
> Hi,
> 
> I am trying to get the mt9p031 working from nand with a ubifs file
> system and I am having a few problems.
> 
> /dev/media0 is not present unless I run:
> #mknod /dev/media0 c 251 0
> #chown root:video /dev/media0
> 
> #media-ctl -p
> Enumerating entities
> media_open: Unable to enumerate entities for device /dev/media0
> (Inappropriate ioctl for device)
> 
> With the same rig/files it works fine running from EXT4 on an SD card.
> Any idea why this does not work on nand with ubifs?

Is the OMAP3 ISP driver loaded ? Has it probed the device successfully ? Check 
the kernel log for OMAP3 ISP-related messages.

-- 
Regards,

Laurent Pinchart

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[CJ]

Hi,

On 19/08/11 22:12, Laurent Pinchart wrote:
>> I am trying to get the mt9p031 working from nand with a ubifs file
>> system and I am having a few problems.
>>
>> /dev/media0 is not present unless I run:
>> #mknod /dev/media0 c 251 0
>> #chown root:video /dev/media0
>>
>> #media-ctl -p
>> Enumerating entities
>> media_open: Unable to enumerate entities for device /dev/media0
>> (Inappropriate ioctl for device)
>>
>> With the same rig/files it works fine running from EXT4 on an SD card.
>> Any idea why this does not work on nand with ubifs?
> Is the OMAP3 ISP driver loaded ? Has it probed the device successfully ? Check
> the kernel log for OMAP3 ISP-related messages.

Here is the version running from SD card:
# dmesg | grep isp
[    0.265502] omap-iommu omap-iommu.0: isp registered
[    2.986541] omap3isp omap3isp: Revision 2.0 found
[    2.991577] omap-iommu omap-iommu.0: isp: version 1.1
[    2.997406] omap3isp omap3isp: hist: DMA channel = 0
[    3.006256] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 
21600000 Hz
[    3.011932] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz

 From NAND using UBIFS:
# dmesg | grep isp
[    3.457061] omap3isp omap3isp: Revision 2.0 found
[    3.462036] omap-iommu omap-iommu.0: isp: version 1.1
[    3.467620] omap3isp omap3isp: hist: DMA channel = 0
[    3.472564] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 
21600000 Hz
[    3.478027] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz

Seems to be missing:
omap-iommu omap-iommu.0: isp registered

Is that the issue? Why would this not work when running from NAND?

Cheers,
Chris

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Laurent Pinchart]

Hi Chris,

On Monday 22 August 2011 06:12:41 CJ wrote:
> On 19/08/11 22:12, Laurent Pinchart wrote:
> >> I am trying to get the mt9p031 working from nand with a ubifs file
> >> system and I am having a few problems.
> >> 
> >> /dev/media0 is not present unless I run:
> >> #mknod /dev/media0 c 251 0
> >> #chown root:video /dev/media0
> >> 
> >> #media-ctl -p
> >> Enumerating entities
> >> media_open: Unable to enumerate entities for device /dev/media0
> >> (Inappropriate ioctl for device)
> >> 
> >> With the same rig/files it works fine running from EXT4 on an SD card.
> >> Any idea why this does not work on nand with ubifs?
> > 
> > Is the OMAP3 ISP driver loaded ? Has it probed the device successfully ?
> > Check the kernel log for OMAP3 ISP-related messages.
> 
> Here is the version running from SD card:
> # dmesg | grep isp
> [    0.265502] omap-iommu omap-iommu.0: isp registered
> [    2.986541] omap3isp omap3isp: Revision 2.0 found
> [    2.991577] omap-iommu omap-iommu.0: isp: version 1.1
> [    2.997406] omap3isp omap3isp: hist: DMA channel = 0
> [    3.006256] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
> 21600000 Hz
> [    3.011932] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
> 
>  From NAND using UBIFS:
> # dmesg | grep isp
> [    3.457061] omap3isp omap3isp: Revision 2.0 found
> [    3.462036] omap-iommu omap-iommu.0: isp: version 1.1
> [    3.467620] omap3isp omap3isp: hist: DMA channel = 0
> [    3.472564] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
> 21600000 Hz
> [    3.478027] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
> 
> Seems to be missing:
> omap-iommu omap-iommu.0: isp registered
> 
> Is that the issue? Why would this not work when running from NAND?

I'm not sure why it doesn't work from NAND, but the iommu2 module needs to be 
loaded before the omap3-isp module. Alternatively you can compile the iommu2 
module in the kernel with

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 49a4c75..3c87644 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -132,7 +132,7 @@ config OMAP_MBOX_KFIFO_SIZE
 	  module parameter).
 
 config OMAP_IOMMU
-       tristate
+       bool
 
 config OMAP_IOMMU_DEBUG
        tristate "Export OMAP IOMMU internals in DebugFS"

-- 
Regards,

Laurent Pinchart

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Michael Jones]

Hi Chris,

On 08/22/2011 11:41 AM, Laurent Pinchart wrote:
> 
> Hi Chris,
> 
> On Monday 22 August 2011 06:12:41 CJ wrote:
>> On 19/08/11 22:12, Laurent Pinchart wrote:
>>>> I am trying to get the mt9p031 working from nand with a ubifs file
>>>> system and I am having a few problems.
>>>>
>>>> /dev/media0 is not present unless I run:
>>>> #mknod /dev/media0 c 251 0
>>>> #chown root:video /dev/media0
>>>>
>>>> #media-ctl -p
>>>> Enumerating entities
>>>> media_open: Unable to enumerate entities for device /dev/media0
>>>> (Inappropriate ioctl for device)
>>>>
>>>> With the same rig/files it works fine running from EXT4 on an SD card.
>>>> Any idea why this does not work on nand with ubifs?
>>>
>>> Is the OMAP3 ISP driver loaded ? Has it probed the device successfully ?
>>> Check the kernel log for OMAP3 ISP-related messages.
>>
>> Here is the version running from SD card:
>> # dmesg | grep isp
>> [    0.265502] omap-iommu omap-iommu.0: isp registered
>> [    2.986541] omap3isp omap3isp: Revision 2.0 found
>> [    2.991577] omap-iommu omap-iommu.0: isp: version 1.1
>> [    2.997406] omap3isp omap3isp: hist: DMA channel = 0
>> [    3.006256] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
>> 21600000 Hz
>> [    3.011932] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
>>
>>  From NAND using UBIFS:
>> # dmesg | grep isp
>> [    3.457061] omap3isp omap3isp: Revision 2.0 found
>> [    3.462036] omap-iommu omap-iommu.0: isp: version 1.1
>> [    3.467620] omap3isp omap3isp: hist: DMA channel = 0
>> [    3.472564] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
>> 21600000 Hz
>> [    3.478027] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
>>
>> Seems to be missing:
>> omap-iommu omap-iommu.0: isp registered
>>
>> Is that the issue? Why would this not work when running from NAND?

I'm not sure, either, but I had a similar problem before using Laurent's
patch below. IIRC, usually udev would create /dev/media0 from a cached
list of /dev/*. Later modutils would come along and load the modules in
the proper order (iommu, then omap3-isp) and everybody was happy.
Occasionally, udev would fail to use the cached version of /dev/, and
look through /sys/devices to re-create the devices in /dev/. When media0
was found, omap3-isp.ko would be loaded, but iommu had not yet been,
presumably because it doesn't have an entry in /sys/devices/. So maybe
udev is behaving differently for you on NAND than it did on the card?
Either way, as I said, using Laurent's patch below did the job for me.

-Michael

> 
> I'm not sure why it doesn't work from NAND, but the iommu2 module needs to be 
> loaded before the omap3-isp module. Alternatively you can compile the iommu2 
> module in the kernel with
> 
> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
> index 49a4c75..3c87644 100644
> --- a/arch/arm/plat-omap/Kconfig
> +++ b/arch/arm/plat-omap/Kconfig
> @@ -132,7 +132,7 @@ config OMAP_MBOX_KFIFO_SIZE
>  	  module parameter).
>  
>  config OMAP_IOMMU
> -       tristate
> +       bool
>  
>  config OMAP_IOMMU_DEBUG
>         tristate "Export OMAP IOMMU internals in DebugFS"
> 


MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[CJ]

Hi Laurent and Michael,

On 22/08/11 22:15, Michael Jones wrote:
>>>>> I am trying to get the mt9p031 working from nand with a ubifs file
>>>>> system and I am having a few problems.
>>>>>
>>>>> /dev/media0 is not present unless I run:
>>>>> #mknod /dev/media0 c 251 0
>>>>> #chown root:video /dev/media0
>>>>>
>>>>> #media-ctl -p
>>>>> Enumerating entities
>>>>> media_open: Unable to enumerate entities for device /dev/media0
>>>>> (Inappropriate ioctl for device)
>>>>>
>>>>> With the same rig/files it works fine running from EXT4 on an SD card.
>>>>> Any idea why this does not work on nand with ubifs?
>>>> Is the OMAP3 ISP driver loaded ? Has it probed the device successfully ?
>>>> Check the kernel log for OMAP3 ISP-related messages.
>>> Here is the version running from SD card:
>>> # dmesg | grep isp
>>> [    0.265502] omap-iommu omap-iommu.0: isp registered
>>> [    2.986541] omap3isp omap3isp: Revision 2.0 found
>>> [    2.991577] omap-iommu omap-iommu.0: isp: version 1.1
>>> [    2.997406] omap3isp omap3isp: hist: DMA channel = 0
>>> [    3.006256] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
>>> 21600000 Hz
>>> [    3.011932] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
>>>
>>>   From NAND using UBIFS:
>>> # dmesg | grep isp
>>> [    3.457061] omap3isp omap3isp: Revision 2.0 found
>>> [    3.462036] omap-iommu omap-iommu.0: isp: version 1.1
>>> [    3.467620] omap3isp omap3isp: hist: DMA channel = 0
>>> [    3.472564] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
>>> 21600000 Hz
>>> [    3.478027] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
>>>
>>> Seems to be missing:
>>> omap-iommu omap-iommu.0: isp registered
>>>
>>> Is that the issue? Why would this not work when running from NAND?
> I'm not sure, either, but I had a similar problem before using Laurent's
> patch below. IIRC, usually udev would create /dev/media0 from a cached
> list of /dev/*. Later modutils would come along and load the modules in
> the proper order (iommu, then omap3-isp) and everybody was happy.
> Occasionally, udev would fail to use the cached version of /dev/, and
> look through /sys/devices to re-create the devices in /dev/. When media0
> was found, omap3-isp.ko would be loaded, but iommu had not yet been,
> presumably because it doesn't have an entry in /sys/devices/. So maybe
> udev is behaving differently for you on NAND than it did on the card?
> Either way, as I said, using Laurent's patch below did the job for me.
>
> -Michael
>
>> I'm not sure why it doesn't work from NAND, but the iommu2 module needs to be
>> loaded before the omap3-isp module. Alternatively you can compile the iommu2
>> module in the kernel with
>>
>> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
>> index 49a4c75..3c87644 100644
>> --- a/arch/arm/plat-omap/Kconfig
>> +++ b/arch/arm/plat-omap/Kconfig
>> @@ -132,7 +132,7 @@ config OMAP_MBOX_KFIFO_SIZE
>>   	  module parameter).
>>
>>   config OMAP_IOMMU
>> -       tristate
>> +       bool
>>
>>   config OMAP_IOMMU_DEBUG
>>          tristate "Export OMAP IOMMU internals in DebugFS"

Thanks for the help!

For some reason dmesg does not read early kernel stuff when in UBIFS 
from NAND.
So when I went back and had a look the line I thought was not there is 
actually included.

[    0.276977] omap-iommu omap-iommu.0: isp registered

So I guess everything is loading fine.

I tried the patch and it didn't make a difference.

Regarding what Michael said /dev/media0 is not created by udev when boot 
from NAND.
I tried creating it manually with:
#mknod /dev/media0 c 251 0
#chown root:video /dev/media0

But this does not work - outputs:

# media-ctl -r -l '"mt9p031 2-0048":0->"OMAP3 ISP CCDC":0[1], "OMAP3 ISP 
CCDC":2->"OMAP3 ISP preview":0[1], "OMAP3 ISP preview":1->"OMAP3 ISP 
resizer":0[1], "OMAP3 ISP resizer":1->"OMAP3 ISP resizer output":0[1]'
media_open: Unable to enumerate entities for device /dev/media0 
(Inappropriate ioctl for device)

So is there a problem with udev?

Cheers,
Chris

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Laurent Pinchart]

Hi Chris,

On Tuesday 23 August 2011 05:47:20 CJ wrote:
> On 22/08/11 22:15, Michael Jones wrote:
> >>>>> I am trying to get the mt9p031 working from nand with a ubifs file
> >>>>> system and I am having a few problems.
> >>>>> 
> >>>>> /dev/media0 is not present unless I run:
> >>>>> #mknod /dev/media0 c 251 0
> >>>>> #chown root:video /dev/media0
> >>>>> 
> >>>>> #media-ctl -p
> >>>>> Enumerating entities
> >>>>> media_open: Unable to enumerate entities for device /dev/media0
> >>>>> (Inappropriate ioctl for device)
> >>>>> 
> >>>>> With the same rig/files it works fine running from EXT4 on an SD
> >>>>> card. Any idea why this does not work on nand with ubifs?
> >>>> 
> >>>> Is the OMAP3 ISP driver loaded ? Has it probed the device successfully
> >>>> ? Check the kernel log for OMAP3 ISP-related messages.
> >>> 
> >>> Here is the version running from SD card:
> >>> # dmesg | grep isp
> >>> [    0.265502] omap-iommu omap-iommu.0: isp registered
> >>> [    2.986541] omap3isp omap3isp: Revision 2.0 found
> >>> [    2.991577] omap-iommu omap-iommu.0: isp: version 1.1
> >>> [    2.997406] omap3isp omap3isp: hist: DMA channel = 0
> >>> [    3.006256] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
> >>> 21600000 Hz
> >>> [    3.011932] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
> >>> 
> >>>   From NAND using UBIFS:
> >>> # dmesg | grep isp
> >>> [    3.457061] omap3isp omap3isp: Revision 2.0 found
> >>> [    3.462036] omap-iommu omap-iommu.0: isp: version 1.1
> >>> [    3.467620] omap3isp omap3isp: hist: DMA channel = 0
> >>> [    3.472564] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
> >>> 21600000 Hz
> >>> [    3.478027] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
> >>> 
> >>> Seems to be missing:
> >>> omap-iommu omap-iommu.0: isp registered
> >>> 
> >>> Is that the issue? Why would this not work when running from NAND?
> > 
> > I'm not sure, either, but I had a similar problem before using Laurent's
> > patch below. IIRC, usually udev would create /dev/media0 from a cached
> > list of /dev/*. Later modutils would come along and load the modules in
> > the proper order (iommu, then omap3-isp) and everybody was happy.
> > Occasionally, udev would fail to use the cached version of /dev/, and
> > look through /sys/devices to re-create the devices in /dev/. When media0
> > was found, omap3-isp.ko would be loaded, but iommu had not yet been,
> > presumably because it doesn't have an entry in /sys/devices/. So maybe
> > udev is behaving differently for you on NAND than it did on the card?
> > Either way, as I said, using Laurent's patch below did the job for me.
> > 
> >> I'm not sure why it doesn't work from NAND, but the iommu2 module needs
> >> to be loaded before the omap3-isp module. Alternatively you can compile
> >> the iommu2 module in the kernel with
> >> 
> >> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
> >> index 49a4c75..3c87644 100644
> >> --- a/arch/arm/plat-omap/Kconfig
> >> +++ b/arch/arm/plat-omap/Kconfig
> >> @@ -132,7 +132,7 @@ config OMAP_MBOX_KFIFO_SIZE
> >> 
> >>   	  module parameter).
> >>   
> >>   config OMAP_IOMMU
> >> 
> >> -       tristate
> >> +       bool
> >> 
> >>   config OMAP_IOMMU_DEBUG
> >>   
> >>          tristate "Export OMAP IOMMU internals in DebugFS"
> 
> Thanks for the help!
> 
> For some reason dmesg does not read early kernel stuff when in UBIFS
> from NAND.
> So when I went back and had a look the line I thought was not there is
> actually included.
> 
> [    0.276977] omap-iommu omap-iommu.0: isp registered
> 
> So I guess everything is loading fine.
> 
> I tried the patch and it didn't make a difference.
> 
> Regarding what Michael said /dev/media0 is not created by udev when boot
> from NAND.
> I tried creating it manually with:
> #mknod /dev/media0 c 251 0
> #chown root:video /dev/media0
> 
> But this does not work - outputs:
> 
> # media-ctl -r -l '"mt9p031 2-0048":0->"OMAP3 ISP CCDC":0[1], "OMAP3 ISP
> CCDC":2->"OMAP3 ISP preview":0[1], "OMAP3 ISP preview":1->"OMAP3 ISP
> resizer":0[1], "OMAP3 ISP resizer":1->"OMAP3 ISP resizer output":0[1]'
> media_open: Unable to enumerate entities for device /dev/media0
> (Inappropriate ioctl for device)
> 
> So is there a problem with udev?

There could be. What's the output of

ls /sys/class/video4linux

-- 
Regards,

Laurent Pinchart

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[CJ]

Hi Laurent,

On 23/08/11 19:47, Laurent Pinchart wrote:
> Hi Chris,
>
> On Tuesday 23 August 2011 05:47:20 CJ wrote:
>> On 22/08/11 22:15, Michael Jones wrote:
>>>>>>> I am trying to get the mt9p031 working from nand with a ubifs file
>>>>>>> system and I am having a few problems.
>>>>>>>
>>>>>>> /dev/media0 is not present unless I run:
>>>>>>> #mknod /dev/media0 c 251 0
>>>>>>> #chown root:video /dev/media0
>>>>>>>
>>>>>>> #media-ctl -p
>>>>>>> Enumerating entities
>>>>>>> media_open: Unable to enumerate entities for device /dev/media0
>>>>>>> (Inappropriate ioctl for device)
>>>>>>>
>>>>>>> With the same rig/files it works fine running from EXT4 on an SD
>>>>>>> card. Any idea why this does not work on nand with ubifs?
>>>>>> Is the OMAP3 ISP driver loaded ? Has it probed the device successfully
>>>>>> ? Check the kernel log for OMAP3 ISP-related messages.
>>>>> Here is the version running from SD card:
>>>>> # dmesg | grep isp
>>>>> [    0.265502] omap-iommu omap-iommu.0: isp registered
>>>>> [    2.986541] omap3isp omap3isp: Revision 2.0 found
>>>>> [    2.991577] omap-iommu omap-iommu.0: isp: version 1.1
>>>>> [    2.997406] omap3isp omap3isp: hist: DMA channel = 0
>>>>> [    3.006256] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
>>>>> 21600000 Hz
>>>>> [    3.011932] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
>>>>>
>>>>>    From NAND using UBIFS:
>>>>> # dmesg | grep isp
>>>>> [    3.457061] omap3isp omap3isp: Revision 2.0 found
>>>>> [    3.462036] omap-iommu omap-iommu.0: isp: version 1.1
>>>>> [    3.467620] omap3isp omap3isp: hist: DMA channel = 0
>>>>> [    3.472564] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
>>>>> 21600000 Hz
>>>>> [    3.478027] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0 Hz
>>>>>
>>>>> Seems to be missing:
>>>>> omap-iommu omap-iommu.0: isp registered
>>>>>
>>>>> Is that the issue? Why would this not work when running from NAND?
>>> I'm not sure, either, but I had a similar problem before using Laurent's
>>> patch below. IIRC, usually udev would create /dev/media0 from a cached
>>> list of /dev/*. Later modutils would come along and load the modules in
>>> the proper order (iommu, then omap3-isp) and everybody was happy.
>>> Occasionally, udev would fail to use the cached version of /dev/, and
>>> look through /sys/devices to re-create the devices in /dev/. When media0
>>> was found, omap3-isp.ko would be loaded, but iommu had not yet been,
>>> presumably because it doesn't have an entry in /sys/devices/. So maybe
>>> udev is behaving differently for you on NAND than it did on the card?
>>> Either way, as I said, using Laurent's patch below did the job for me.
>>>
>>>> I'm not sure why it doesn't work from NAND, but the iommu2 module needs
>>>> to be loaded before the omap3-isp module. Alternatively you can compile
>>>> the iommu2 module in the kernel with
>>>>
>>>> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
>>>> index 49a4c75..3c87644 100644
>>>> --- a/arch/arm/plat-omap/Kconfig
>>>> +++ b/arch/arm/plat-omap/Kconfig
>>>> @@ -132,7 +132,7 @@ config OMAP_MBOX_KFIFO_SIZE
>>>>
>>>>    	  module parameter).
>>>>
>>>>    config OMAP_IOMMU
>>>>
>>>> -       tristate
>>>> +       bool
>>>>
>>>>    config OMAP_IOMMU_DEBUG
>>>>
>>>>           tristate "Export OMAP IOMMU internals in DebugFS"
>> Thanks for the help!
>>
>> For some reason dmesg does not read early kernel stuff when in UBIFS
>> from NAND.
>> So when I went back and had a look the line I thought was not there is
>> actually included.
>>
>> [    0.276977] omap-iommu omap-iommu.0: isp registered
>>
>> So I guess everything is loading fine.
>>
>> I tried the patch and it didn't make a difference.
>>
>> Regarding what Michael said /dev/media0 is not created by udev when boot
>> from NAND.
>> I tried creating it manually with:
>> #mknod /dev/media0 c 251 0
>> #chown root:video /dev/media0
>>
>> But this does not work - outputs:
>>
>> # media-ctl -r -l '"mt9p031 2-0048":0->"OMAP3 ISP CCDC":0[1], "OMAP3 ISP
>> CCDC":2->"OMAP3 ISP preview":0[1], "OMAP3 ISP preview":1->"OMAP3 ISP
>> resizer":0[1], "OMAP3 ISP resizer":1->"OMAP3 ISP resizer output":0[1]'
>> media_open: Unable to enumerate entities for device /dev/media0
>> (Inappropriate ioctl for device)
>>
>> So is there a problem with udev?
> There could be. What's the output of
>
> ls /sys/class/video4linux
>

#ls /sys/class/video4linux
v4l-subdev0  v4l-subdev3  v4l-subdev6  video0       video3       video6
v4l-subdev1  v4l-subdev4  v4l-subdev7  video1       video4
v4l-subdev2  v4l-subdev5  v4l-subdev8  video2       video5

Cheers,
Chris

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[Laurent Pinchart]

On Wednesday 24 August 2011 03:17:39 CJ wrote:
> On 23/08/11 19:47, Laurent Pinchart wrote:
> > On Tuesday 23 August 2011 05:47:20 CJ wrote:
> >> On 22/08/11 22:15, Michael Jones wrote:
> >>>>>>> I am trying to get the mt9p031 working from nand with a ubifs file
> >>>>>>> system and I am having a few problems.
> >>>>>>> 
> >>>>>>> /dev/media0 is not present unless I run:
> >>>>>>> #mknod /dev/media0 c 251 0
> >>>>>>> #chown root:video /dev/media0
> >>>>>>> 
> >>>>>>> #media-ctl -p
> >>>>>>> Enumerating entities
> >>>>>>> media_open: Unable to enumerate entities for device /dev/media0
> >>>>>>> (Inappropriate ioctl for device)
> >>>>>>> 
> >>>>>>> With the same rig/files it works fine running from EXT4 on an SD
> >>>>>>> card. Any idea why this does not work on nand with ubifs?
> >>>>>> 
> >>>>>> Is the OMAP3 ISP driver loaded ? Has it probed the device
> >>>>>> successfully ? Check the kernel log for OMAP3 ISP-related messages.
> >>>>> 
> >>>>> Here is the version running from SD card:
> >>>>> # dmesg | grep isp
> >>>>> [    0.265502] omap-iommu omap-iommu.0: isp registered
> >>>>> [    2.986541] omap3isp omap3isp: Revision 2.0 found
> >>>>> [    2.991577] omap-iommu omap-iommu.0: isp: version 1.1
> >>>>> [    2.997406] omap3isp omap3isp: hist: DMA channel = 0
> >>>>> [    3.006256] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
> >>>>> 21600000 Hz
> >>>>> [    3.011932] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0
> >>>>> Hz
> >>>>> 
> >>>>>    From NAND using UBIFS:
> >>>>> # dmesg | grep isp
> >>>>> [    3.457061] omap3isp omap3isp: Revision 2.0 found
> >>>>> [    3.462036] omap-iommu omap-iommu.0: isp: version 1.1
> >>>>> [    3.467620] omap3isp omap3isp: hist: DMA channel = 0
> >>>>> [    3.472564] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
> >>>>> 21600000 Hz
> >>>>> [    3.478027] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0
> >>>>> Hz
> >>>>> 
> >>>>> Seems to be missing:
> >>>>> omap-iommu omap-iommu.0: isp registered
> >>>>> 
> >>>>> Is that the issue? Why would this not work when running from NAND?
> >>> 
> >>> I'm not sure, either, but I had a similar problem before using
> >>> Laurent's patch below. IIRC, usually udev would create /dev/media0
> >>> from a cached list of /dev/*. Later modutils would come along and load
> >>> the modules in the proper order (iommu, then omap3-isp) and everybody
> >>> was happy. Occasionally, udev would fail to use the cached version of
> >>> /dev/, and look through /sys/devices to re-create the devices in
> >>> /dev/. When media0 was found, omap3-isp.ko would be loaded, but iommu
> >>> had not yet been, presumably because it doesn't have an entry in
> >>> /sys/devices/. So maybe udev is behaving differently for you on NAND
> >>> than it did on the card? Either way, as I said, using Laurent's patch
> >>> below did the job for me.
> >>> 
> >>>> I'm not sure why it doesn't work from NAND, but the iommu2 module
> >>>> needs to be loaded before the omap3-isp module. Alternatively you can
> >>>> compile the iommu2 module in the kernel with
> >>>> 
> >>>> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
> >>>> index 49a4c75..3c87644 100644
> >>>> --- a/arch/arm/plat-omap/Kconfig
> >>>> +++ b/arch/arm/plat-omap/Kconfig
> >>>> @@ -132,7 +132,7 @@ config OMAP_MBOX_KFIFO_SIZE
> >>>> 
> >>>>    	  module parameter).
> >>>>    
> >>>>    config OMAP_IOMMU
> >>>> 
> >>>> -       tristate
> >>>> +       bool
> >>>> 
> >>>>    config OMAP_IOMMU_DEBUG
> >>>>    
> >>>>           tristate "Export OMAP IOMMU internals in DebugFS"
> >> 
> >> Thanks for the help!
> >> 
> >> For some reason dmesg does not read early kernel stuff when in UBIFS
> >> from NAND.
> >> So when I went back and had a look the line I thought was not there is
> >> actually included.
> >> 
> >> [    0.276977] omap-iommu omap-iommu.0: isp registered
> >> 
> >> So I guess everything is loading fine.
> >> 
> >> I tried the patch and it didn't make a difference.
> >> 
> >> Regarding what Michael said /dev/media0 is not created by udev when boot
> >> from NAND.
> >> I tried creating it manually with:
> >> #mknod /dev/media0 c 251 0
> >> #chown root:video /dev/media0
> >> 
> >> But this does not work - outputs:
> >> 
> >> # media-ctl -r -l '"mt9p031 2-0048":0->"OMAP3 ISP CCDC":0[1], "OMAP3 ISP
> >> CCDC":2->"OMAP3 ISP preview":0[1], "OMAP3 ISP preview":1->"OMAP3 ISP
> >> resizer":0[1], "OMAP3 ISP resizer":1->"OMAP3 ISP resizer output":0[1]'
> >> media_open: Unable to enumerate entities for device /dev/media0
> >> (Inappropriate ioctl for device)
> >> 
> >> So is there a problem with udev?
> > 
> > There could be. What's the output of
> > 
> > ls /sys/class/video4linux
> 
> #ls /sys/class/video4linux
> v4l-subdev0  v4l-subdev3  v4l-subdev6  video0       video3       video6
> v4l-subdev1  v4l-subdev4  v4l-subdev7  video1       video4
> v4l-subdev2  v4l-subdev5  v4l-subdev8  video2       video5

Devices are correctly registered with the Linux kernel. Does 'ls /dev/v4l-
subdev*' show the same entries ? If not you probably have a udev issue.

-- 
Regards,

Laurent Pinchart

Re: [beagleboard] Re: [PATCH v7 1/2] Add driver for Aptina (Micron) mt9p031 sensor.

[CJ]

On 24/08/11 21:12, Laurent Pinchart wrote:
> On Wednesday 24 August 2011 03:17:39 CJ wrote:
>> On 23/08/11 19:47, Laurent Pinchart wrote:
>>> On Tuesday 23 August 2011 05:47:20 CJ wrote:
>>>> On 22/08/11 22:15, Michael Jones wrote:
>>>>>>>>> I am trying to get the mt9p031 working from nand with a ubifs file
>>>>>>>>> system and I am having a few problems.
>>>>>>>>>
>>>>>>>>> /dev/media0 is not present unless I run:
>>>>>>>>> #mknod /dev/media0 c 251 0
>>>>>>>>> #chown root:video /dev/media0
>>>>>>>>>
>>>>>>>>> #media-ctl -p
>>>>>>>>> Enumerating entities
>>>>>>>>> media_open: Unable to enumerate entities for device /dev/media0
>>>>>>>>> (Inappropriate ioctl for device)
>>>>>>>>>
>>>>>>>>> With the same rig/files it works fine running from EXT4 on an SD
>>>>>>>>> card. Any idea why this does not work on nand with ubifs?
>>>>>>>> Is the OMAP3 ISP driver loaded ? Has it probed the device
>>>>>>>> successfully ? Check the kernel log for OMAP3 ISP-related messages.
>>>>>>> Here is the version running from SD card:
>>>>>>> # dmesg | grep isp
>>>>>>> [    0.265502] omap-iommu omap-iommu.0: isp registered
>>>>>>> [    2.986541] omap3isp omap3isp: Revision 2.0 found
>>>>>>> [    2.991577] omap-iommu omap-iommu.0: isp: version 1.1
>>>>>>> [    2.997406] omap3isp omap3isp: hist: DMA channel = 0
>>>>>>> [    3.006256] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
>>>>>>> 21600000 Hz
>>>>>>> [    3.011932] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0
>>>>>>> Hz
>>>>>>>
>>>>>>>     From NAND using UBIFS:
>>>>>>> # dmesg | grep isp
>>>>>>> [    3.457061] omap3isp omap3isp: Revision 2.0 found
>>>>>>> [    3.462036] omap-iommu omap-iommu.0: isp: version 1.1
>>>>>>> [    3.467620] omap3isp omap3isp: hist: DMA channel = 0
>>>>>>> [    3.472564] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to
>>>>>>> 21600000 Hz
>>>>>>> [    3.478027] omap3isp omap3isp: isp_set_xclk(): cam_xclka set to 0
>>>>>>> Hz
>>>>>>>
>>>>>>> Seems to be missing:
>>>>>>> omap-iommu omap-iommu.0: isp registered
>>>>>>>
>>>>>>> Is that the issue? Why would this not work when running from NAND?
>>>>> I'm not sure, either, but I had a similar problem before using
>>>>> Laurent's patch below. IIRC, usually udev would create /dev/media0
>>>>> from a cached list of /dev/*. Later modutils would come along and load
>>>>> the modules in the proper order (iommu, then omap3-isp) and everybody
>>>>> was happy. Occasionally, udev would fail to use the cached version of
>>>>> /dev/, and look through /sys/devices to re-create the devices in
>>>>> /dev/. When media0 was found, omap3-isp.ko would be loaded, but iommu
>>>>> had not yet been, presumably because it doesn't have an entry in
>>>>> /sys/devices/. So maybe udev is behaving differently for you on NAND
>>>>> than it did on the card? Either way, as I said, using Laurent's patch
>>>>> below did the job for me.
>>>>>
>>>>>> I'm not sure why it doesn't work from NAND, but the iommu2 module
>>>>>> needs to be loaded before the omap3-isp module. Alternatively you can
>>>>>> compile the iommu2 module in the kernel with
>>>>>>
>>>>>> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
>>>>>> index 49a4c75..3c87644 100644
>>>>>> --- a/arch/arm/plat-omap/Kconfig
>>>>>> +++ b/arch/arm/plat-omap/Kconfig
>>>>>> @@ -132,7 +132,7 @@ config OMAP_MBOX_KFIFO_SIZE
>>>>>>
>>>>>>     	  module parameter).
>>>>>>
>>>>>>     config OMAP_IOMMU
>>>>>>
>>>>>> -       tristate
>>>>>> +       bool
>>>>>>
>>>>>>     config OMAP_IOMMU_DEBUG
>>>>>>
>>>>>>            tristate "Export OMAP IOMMU internals in DebugFS"
>>>> Thanks for the help!
>>>>
>>>> For some reason dmesg does not read early kernel stuff when in UBIFS
>>>> from NAND.
>>>> So when I went back and had a look the line I thought was not there is
>>>> actually included.
>>>>
>>>> [    0.276977] omap-iommu omap-iommu.0: isp registered
>>>>
>>>> So I guess everything is loading fine.
>>>>
>>>> I tried the patch and it didn't make a difference.
>>>>
>>>> Regarding what Michael said /dev/media0 is not created by udev when boot
>>>> from NAND.
>>>> I tried creating it manually with:
>>>> #mknod /dev/media0 c 251 0
>>>> #chown root:video /dev/media0
>>>>
>>>> But this does not work - outputs:
>>>>
>>>> # media-ctl -r -l '"mt9p031 2-0048":0->"OMAP3 ISP CCDC":0[1], "OMAP3 ISP
>>>> CCDC":2->"OMAP3 ISP preview":0[1], "OMAP3 ISP preview":1->"OMAP3 ISP
>>>> resizer":0[1], "OMAP3 ISP resizer":1->"OMAP3 ISP resizer output":0[1]'
>>>> media_open: Unable to enumerate entities for device /dev/media0
>>>> (Inappropriate ioctl for device)
>>>>
>>>> So is there a problem with udev?
>>> There could be. What's the output of
>>>
>>> ls /sys/class/video4linux
>> #ls /sys/class/video4linux
>> v4l-subdev0  v4l-subdev3  v4l-subdev6  video0       video3       video6
>> v4l-subdev1  v4l-subdev4  v4l-subdev7  video1       video4
>> v4l-subdev2  v4l-subdev5  v4l-subdev8  video2       video5
> Devices are correctly registered with the Linux kernel. Does 'ls /dev/v4l-
> subdev*' show the same entries ? If not you probably have a udev issue.
>

Slightly different..

# ls /dev/v4l-subdev*
/dev/v4l-subdev0  /dev/v4l-subdev3  /dev/v4l-subdev6
/dev/v4l-subdev1  /dev/v4l-subdev4  /dev/v4l-subdev7
/dev/v4l-subdev2  /dev/v4l-subdev5  /dev/v4l-subdev8

I probably should have said this earlier .. but I am using mdev not udev.
It does work fine with exactly the same system running from the card in 
EXT4.

Any other thoughts?

Cheers,
Chris