10 files changed, 233 insertions, 26 deletions

diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index a4274203f252..bfee8be5d63f 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -107,6 +107,7 @@ extern IR_KEYTAB_TYPE ir_codes_avermedia[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_avermedia_dvbt[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_apac_viewcomp[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_pixelview_new[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_nebula[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_dntv_live_dvb_t[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_iodata_bctv7e[IR_KEYTAB_SIZE];
@@ -141,8 +142,10 @@ extern IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_fusionhdtv_mce[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_behold[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_behold_columbus[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_pinnacle_pctv_hd[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE];
 
 #endif
 
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
new file mode 100644
index 000000000000..6a8c8be7a1ae
--- /dev/null
+++ b/include/media/soc_camera.h
@@ -0,0 +1,179 @@
+/*
+ * camera image capture (abstract) bus driver header
+ *
+ * Copyright (C) 2006, Sascha Hauer, Pengutronix
+ * Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de>
+ *
+ * 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 SOC_CAMERA_H
+#define SOC_CAMERA_H
+
+#include <linux/videodev2.h>
+#include <media/videobuf-dma-sg.h>
+
+struct soc_camera_device {
+        struct list_head list;
+        struct device dev;
+        struct device *control;
+        unsigned short width;           /* Current window */
+        unsigned short height;          /* sizes */
+        unsigned short x_min;           /* Camera capabilities */
+        unsigned short y_min;
+        unsigned short x_current;       /* Current window location */
+        unsigned short y_current;
+        unsigned short width_min;
+        unsigned short width_max;
+        unsigned short height_min;
+        unsigned short height_max;
+        unsigned short y_skip_top;      /* Lines to skip at the top */
+        unsigned short gain;
+        unsigned short exposure;
+        unsigned char iface;            /* Host number */
+        unsigned char devnum;           /* Device number per host */
+        unsigned char buswidth;         /* See comment in .c */
+        struct soc_camera_ops *ops;
+        struct video_device *vdev;
+        const struct soc_camera_data_format *current_fmt;
+        const struct soc_camera_data_format *formats;
+        int num_formats;
+        struct module *owner;
+        /* soc_camera.c private count. Only accessed with video_lock held */
+        int use_count;
+};
+
+struct soc_camera_file {
+        struct soc_camera_device *icd;
+        struct videobuf_queue vb_vidq;
+        spinlock_t *lock;
+};
+
+struct soc_camera_host {
+        struct list_head list;
+        struct device dev;
+        unsigned char nr;                               /* Host number */
+        size_t msize;
+        struct videobuf_queue_ops *vbq_ops;
+        void *priv;
+        char *drv_name;
+        struct soc_camera_host_ops *ops;
+};
+
+struct soc_camera_host_ops {
+        struct module *owner;
+        int (*add)(struct soc_camera_device *);
+        void (*remove)(struct soc_camera_device *);
+        int (*set_fmt_cap)(struct soc_camera_device *, __u32,
+                           struct v4l2_rect *);
+        int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *);
+        int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *);
+        int (*querycap)(struct soc_camera_host *, struct v4l2_capability *);
+        int (*try_bus_param)(struct soc_camera_device *, __u32);
+        int (*set_bus_param)(struct soc_camera_device *, __u32);
+        unsigned int (*poll)(struct file *, poll_table *);
+        spinlock_t* (*spinlock_alloc)(struct soc_camera_file *);
+        void (*spinlock_free)(spinlock_t *);
+};
+
+struct soc_camera_link {
+        /* Camera bus id, used to match a camera and a bus */
+        int bus_id;
+        /* GPIO number to switch between 8 and 10 bit modes */
+        unsigned int gpio;
+};
+
+static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev)
+{
+        return container_of(dev, struct soc_camera_device, dev);
+}
+
+static inline struct soc_camera_host *to_soc_camera_host(struct device *dev)
+{
+        return container_of(dev, struct soc_camera_host, dev);
+}
+
+extern int soc_camera_host_register(struct soc_camera_host *ici);
+extern void soc_camera_host_unregister(struct soc_camera_host *ici);
+extern int soc_camera_device_register(struct soc_camera_device *icd);
+extern void soc_camera_device_unregister(struct soc_camera_device *icd);
+
+extern int soc_camera_video_start(struct soc_camera_device *icd);
+extern void soc_camera_video_stop(struct soc_camera_device *icd);
+
+struct soc_camera_data_format {
+        char *name;
+        unsigned int depth;
+        __u32 fourcc;
+        enum v4l2_colorspace colorspace;
+};
+
+struct soc_camera_ops {
+        struct module *owner;
+        int (*probe)(struct soc_camera_device *);
+        void (*remove)(struct soc_camera_device *);
+        int (*init)(struct soc_camera_device *);
+        int (*release)(struct soc_camera_device *);
+        int (*start_capture)(struct soc_camera_device *);
+        int (*stop_capture)(struct soc_camera_device *);
+        int (*set_fmt_cap)(struct soc_camera_device *, __u32,
+                           struct v4l2_rect *);
+        int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *);
+        unsigned long (*query_bus_param)(struct soc_camera_device *);
+        int (*set_bus_param)(struct soc_camera_device *, unsigned long);
+        int (*get_chip_id)(struct soc_camera_device *,
+                           struct v4l2_chip_ident *);
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        int (*get_register)(struct soc_camera_device *, struct v4l2_register *);
+        int (*set_register)(struct soc_camera_device *, struct v4l2_register *);
+#endif
+        int (*get_control)(struct soc_camera_device *, struct v4l2_control *);
+        int (*set_control)(struct soc_camera_device *, struct v4l2_control *);
+        const struct v4l2_queryctrl *controls;
+        int num_controls;
+};
+
+static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
+        struct soc_camera_ops *ops, int id)
+{
+        int i;
+
+        for (i = 0; i < ops->num_controls; i++)
+                if (ops->controls[i].id == id)
+                        return &ops->controls[i];
+
+        return NULL;
+}
+
+#define SOCAM_MASTER                    (1 << 0)
+#define SOCAM_SLAVE                     (1 << 1)
+#define SOCAM_HSYNC_ACTIVE_HIGH         (1 << 2)
+#define SOCAM_HSYNC_ACTIVE_LOW          (1 << 3)
+#define SOCAM_VSYNC_ACTIVE_HIGH         (1 << 4)
+#define SOCAM_VSYNC_ACTIVE_LOW          (1 << 5)
+#define SOCAM_DATAWIDTH_8               (1 << 6)
+#define SOCAM_DATAWIDTH_9               (1 << 7)
+#define SOCAM_DATAWIDTH_10              (1 << 8)
+#define SOCAM_PCLK_SAMPLE_RISING        (1 << 9)
+#define SOCAM_PCLK_SAMPLE_FALLING       (1 << 10)
+
+#define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_9 | \
+                              SOCAM_DATAWIDTH_10)
+
+static inline unsigned long soc_camera_bus_param_compatible(
+                        unsigned long camera_flags, unsigned long bus_flags)
+{
+        unsigned long common_flags, hsync, vsync, pclk;
+
+        common_flags = camera_flags & bus_flags;
+
+        hsync = common_flags & (SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW);
+        vsync = common_flags & (SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW);
+        pclk = common_flags & (SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING);
+
+        return (!hsync || !vsync || !pclk) ? 0 : common_flags;
+}
+
+#endif
diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
index b201371416a0..ab03c5344209 100644
--- a/include/media/tuner-types.h
+++ b/include/media/tuner-types.h
@@ -6,10 +6,11 @@
 #define __TUNER_TYPES_H__
 
 enum param_type {
-        TUNER_PARAM_TYPE_RADIO, \
-        TUNER_PARAM_TYPE_PAL, \
-        TUNER_PARAM_TYPE_SECAM, \
-        TUNER_PARAM_TYPE_NTSC
+        TUNER_PARAM_TYPE_RADIO,
+        TUNER_PARAM_TYPE_PAL,
+        TUNER_PARAM_TYPE_SECAM,
+        TUNER_PARAM_TYPE_NTSC,
+        TUNER_PARAM_TYPE_DIGITAL,
 };
 
 struct tuner_range {
@@ -105,6 +106,7 @@ struct tuner_params {
            the SECAM-L/L' standards. Range: -16:+15 */
         signed int default_top_secam_high:5;
 
+        u16 iffreq;
 
         unsigned int count;
         struct tuner_range *ranges;
@@ -114,6 +116,13 @@ struct tunertype {
         char *name;
         unsigned int count;
         struct tuner_params *params;
+
+        u16 min;
+        u16 max;
+        u32 stepsize;
+
+        u8 *initdata;
+        u8 *sleepdata;
 };
 
 extern struct tunertype tuners[];
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 1bf24a6ed8f1..77068fcc86bd 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -78,7 +78,7 @@
 
 #define TUNER_HITACHI_NTSC              40
 #define TUNER_PHILIPS_PAL_MK            41
-#define TUNER_PHILIPS_ATSC              42
+#define TUNER_PHILIPS_FCV1236D          42
 #define TUNER_PHILIPS_FM1236_MK3        43
 
 #define TUNER_PHILIPS_4IN1              44      /* ATI TV Wonder Pro - Conexant */
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 032bb75f69c2..0ea0bd85c036 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -153,6 +153,12 @@ enum {
         V4L2_IDENT_MSP4428G = 44287,
         V4L2_IDENT_MSP4448G = 44487,
         V4L2_IDENT_MSP4458G = 44587,
+
+        /* Micron CMOS sensor chips: 45000-45099 */
+        V4L2_IDENT_MT9M001C12ST         = 45000,
+        V4L2_IDENT_MT9M001C12STM        = 45005,
+        V4L2_IDENT_MT9V022IX7ATC        = 45010, /* No way to detect "normal" I77ATx */
+        V4L2_IDENT_MT9V022IX7ATM        = 45015, /* and "lead free" IA7ATx chips */
 };
 
 #endif
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index f2114459995d..a807d2f86ee8 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -318,6 +318,10 @@ struct video_device
         int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
                                         struct v4l2_chip_ident *chip);
 
+        /* For other private ioctls */
+        int (*vidioc_default)          (struct file *file, void *fh,
+                                        int cmd, void *arg);
+
 
 #ifdef OBSOLETE_OWNER /* to be removed soon */
 /* obsolete -- fops->owner is used instead */
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 99033945cdee..5b39a22533fe 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -13,6 +13,9 @@
  * the Free Software Foundation; either version 2
  */
 
+#ifndef _VIDEOBUF_CORE_H
+#define _VIDEOBUF_CORE_H
+
 #include <linux/poll.h>
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 #include <linux/videodev.h>
@@ -123,7 +126,8 @@ struct videobuf_queue_ops {
 struct videobuf_qtype_ops {
         u32                     magic;
 
-        void* (*alloc)          (size_t size);
+        void *(*alloc)          (size_t size);
+        void *(*vmalloc)        (struct videobuf_buffer *buf);
         int (*iolock)           (struct videobuf_queue* q,
                                  struct videobuf_buffer *vb,
                                  struct v4l2_framebuffer *fbuf);
@@ -151,7 +155,9 @@ struct videobuf_qtype_ops {
 struct videobuf_queue {
         struct mutex               vb_lock;
         spinlock_t                 *irqlock;
-        void                       *dev; /* on pci, points to struct pci_dev */
+        struct device              *dev;
+
+        wait_queue_head_t          wait; /* wait if queue is empty */
 
         enum v4l2_buf_type         type;
         unsigned int               inputs; /* for V4L2_BUF_FLAG_INPUT */
@@ -183,9 +189,13 @@ int videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb,
 
 void *videobuf_alloc(struct videobuf_queue* q);
 
+/* Used on videobuf-dvb */
+void *videobuf_queue_to_vmalloc (struct videobuf_queue* q,
+                                 struct videobuf_buffer *buf);
+
 void videobuf_queue_core_init(struct videobuf_queue *q,
                          struct videobuf_queue_ops *ops,
-                         void *dev,
+                         struct device *dev,
                          spinlock_t *irqlock,
                          enum v4l2_buf_type type,
                          enum v4l2_field field,
@@ -231,10 +241,4 @@ int videobuf_mmap_free(struct videobuf_queue *q);
 int videobuf_mmap_mapper(struct videobuf_queue *q,
                          struct vm_area_struct *vma);
 
-/* --------------------------------------------------------------------- */
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
+#endif
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index 38105031db23..be8da269ee33 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -1,5 +1,5 @@
 /*
- * helper functions for PCI DMA video4linux capture buffers
+ * helper functions for SG DMA video4linux capture buffers
  *
  * The functions expect the hardware being able to scatter gatter
  * (i.e. the buffers are not linear in physical memory, but fragmented
@@ -68,9 +68,6 @@ struct videobuf_dmabuf {
         /* for kernel buffers */
         void                *vmalloc;
 
-        /* Stores the userspace pointer to vmalloc area */
-        void                *varea;
-
         /* for overlay buffers (pci-pci dma) */
         dma_addr_t          bus_addr;
 
@@ -81,7 +78,7 @@ struct videobuf_dmabuf {
         int                 direction;
 };
 
-struct videbuf_pci_sg_memory
+struct videobuf_dma_sg_memory
 {
         u32                 magic;
 
@@ -103,11 +100,11 @@ int videobuf_dma_sync(struct videobuf_queue* q,struct videobuf_dmabuf *dma);
 int videobuf_dma_unmap(struct videobuf_queue* q,struct videobuf_dmabuf *dma);
 struct videobuf_dmabuf *videobuf_to_dma (struct videobuf_buffer *buf);
 
-void *videobuf_pci_alloc (size_t size);
+void *videobuf_sg_alloc(size_t size);
 
-void videobuf_queue_pci_init(struct videobuf_queue* q,
+void videobuf_queue_sg_init(struct videobuf_queue* q,
                          struct videobuf_queue_ops *ops,
-                         void *dev,
+                         struct device *dev,
                          spinlock_t *irqlock,
                          enum v4l2_buf_type type,
                          enum v4l2_field field,
@@ -117,6 +114,6 @@ void videobuf_queue_pci_init(struct videobuf_queue* q,
         /*FIXME: these variants are used only on *-alsa code, where videobuf is
          * used without queue
          */
-int videobuf_pci_dma_map(struct pci_dev *pci,struct videobuf_dmabuf *dma);
-int videobuf_pci_dma_unmap(struct pci_dev *pci,struct videobuf_dmabuf *dma);
+int videobuf_sg_dma_map(struct device *dev, struct videobuf_dmabuf *dma);
+int videobuf_sg_dma_unmap(struct device *dev, struct videobuf_dmabuf *dma);
 
diff --git a/include/media/videobuf-dvb.h b/include/media/videobuf-dvb.h
index 8233cafdeef6..b77748696329 100644
--- a/include/media/videobuf-dvb.h
+++ b/include/media/videobuf-dvb.h
@@ -27,7 +27,8 @@ struct videobuf_dvb {
 int videobuf_dvb_register(struct videobuf_dvb *dvb,
                           struct module *module,
                           void *adapter_priv,
-                          struct device *device);
+                          struct device *device,
+                          short *adapter_nr);
 void videobuf_dvb_unregister(struct videobuf_dvb *dvb);
 
 /*
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index ec63ab0fab93..aed39460c154 100644
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -12,6 +12,8 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2
  */
+#ifndef _VIDEOBUF_VMALLOC_H
+#define _VIDEOBUF_VMALLOC_H
 
 #include <media/videobuf-core.h>
 
@@ -39,3 +41,5 @@ void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
 void *videobuf_to_vmalloc (struct videobuf_buffer *buf);
 
 void videobuf_vmalloc_free (struct videobuf_buffer *buf);
+
+#endif