Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 35 insertions, 0 deletions

diff --git a/include/media/omap1_camera.h b/include/media/omap1_camera.h
new file mode 100644
index 000000000000..819767cf04d4
--- /dev/null
+++ b/include/media/omap1_camera.h
@@ -0,0 +1,35 @@
+/*
+ * Header for V4L2 SoC Camera driver for OMAP1 Camera Interface
+ *
+ * Copyright (C) 2010, Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
+ *
+ * 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.
+ */
+
+#ifndef __MEDIA_OMAP1_CAMERA_H_
+#define __MEDIA_OMAP1_CAMERA_H_
+
+#include <linux/bitops.h>
+
+#define OMAP1_CAMERA_IOSIZE             0x1c
+
+enum omap1_cam_vb_mode {
+        OMAP1_CAM_DMA_CONTIG = 0,
+        OMAP1_CAM_DMA_SG,
+};
+
+#define OMAP1_CAMERA_MIN_BUF_COUNT(x)   ((x) == OMAP1_CAM_DMA_CONTIG ? 3 : 2)
+
+struct omap1_cam_platform_data {
+        unsigned long   camexclk_khz;
+        unsigned long   lclk_khz_max;
+        unsigned long   flags;
+};
+
+#define OMAP1_CAMERA_LCLK_RISING        BIT(0)
+#define OMAP1_CAMERA_RST_LOW            BIT(1)
+#define OMAP1_CAMERA_RST_HIGH           BIT(2)
+
+#endif /* __MEDIA_OMAP1_CAMERA_H_ */