11 files changed, 96 insertions, 41 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index dd13e3a4c272..4ef0d80b57f4 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -163,19 +163,21 @@ source "drivers/media/common/Kconfig"
 #
 
 config MEDIA_SUBDRV_AUTOSELECT
-        bool "Autoselect analog and hybrid tuner modules to build"
-        depends on MEDIA_TUNER
+        bool "Autoselect tuners and i2c modules to build"
+        depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_CAMERA_SUPPORT
         default y
         help
-          By default, a TV driver auto-selects all possible tuners
-          thar could be used by the driver.
+          By default, a media driver auto-selects all possible i2c
+          devices that are used by any of the supported devices.
 
           This is generally the right thing to do, except when there
-          are strict constraints with regards to the kernel size.
+          are strict constraints with regards to the kernel size,
+          like on embedded systems.
 
-          Use this option with care, as deselecting tuner drivers which
-          are in fact necessary will result in TV devices which cannot
-          be tuned due to lack of the tuning driver.
+          Use this option with care, as deselecting ancillary drivers which
+          are, in fact, necessary will result in the lack of the needed
+          functionality for your device (it may not tune or may not have
+          the need demodulers).
 
           If unsure say Y.
 
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index a3b1a34c896d..4b1becc86e54 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -45,8 +45,8 @@
 #include <media/v4l2-ioctl.h>
 
 #include <plat/cpu.h>
-#include <plat/dma.h>
-#include <plat/vrfb.h>
+#include <plat-omap/dma-omap.h>
+#include <video/omapvrfb.h>
 #include <video/omapdss.h>
 
 #include "omap_voutlib.h"
diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c
index 4be26abf6cea..8340445a0ee5 100644
--- a/drivers/media/platform/omap/omap_vout_vrfb.c
+++ b/drivers/media/platform/omap/omap_vout_vrfb.c
@@ -16,12 +16,14 @@
 #include <media/videobuf-dma-contig.h>
 #include <media/v4l2-device.h>
 
-#include <plat/dma.h>
-#include <plat/vrfb.h>
+#include <plat-omap/dma-omap.h>
+#include <video/omapvrfb.h>
 
 #include "omap_voutdef.h"
 #include "omap_voutlib.h"
 
+#define OMAP_DMA_NO_DEVICE      0
+
 /*
  * Function for allocating video buffers
  */
diff --git a/drivers/media/platform/omap/omap_voutdef.h b/drivers/media/platform/omap/omap_voutdef.h
index 27a95d23b913..9ccfe1f475a4 100644
--- a/drivers/media/platform/omap/omap_voutdef.h
+++ b/drivers/media/platform/omap/omap_voutdef.h
@@ -12,7 +12,7 @@
 #define OMAP_VOUTDEF_H
 
 #include <video/omapdss.h>
-#include <plat/vrfb.h>
+#include <video/omapvrfb.h>
 
 #define YUYV_BPP        2
 #define RGB565_BPP      2
diff --git a/drivers/media/platform/omap3isp/isphist.c b/drivers/media/platform/omap3isp/isphist.c
index d1a8dee5e1ca..e7f9c4292cc6 100644
--- a/drivers/media/platform/omap3isp/isphist.c
+++ b/drivers/media/platform/omap3isp/isphist.c
@@ -34,6 +34,8 @@
 #include "ispreg.h"
 #include "isphist.h"
 
+#define OMAP24XX_DMA_NO_DEVICE          0
+
 #define HIST_CONFIG_DMA 1
 
 #define HIST_USING_DMA(hist) ((hist)->dma_ch >= 0)
diff --git a/drivers/media/platform/omap3isp/ispstat.h b/drivers/media/platform/omap3isp/ispstat.h
index a6fe653eb237..40f87cdd7994 100644
--- a/drivers/media/platform/omap3isp/ispstat.h
+++ b/drivers/media/platform/omap3isp/ispstat.h
@@ -30,7 +30,7 @@
 
 #include <linux/types.h>
 #include <linux/omap3isp.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <media/v4l2-event.h>
 
 #include "isp.h"
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 21f7313e6999..c4be4fa8a7d7 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -35,6 +35,8 @@
 #include <linux/vmalloc.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
+#include <plat/iommu.h>
+#include <plat/iovmm.h>
 #include <plat/omap-pm.h>
 
 #include "ispvideo.h"
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 9fd9d1c5b218..e575ae82771d 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -41,7 +41,6 @@
 #include <linux/videodev2.h>
 
 #include <linux/platform_data/camera-mx2.h>
-#include <mach/hardware.h>
 
 #include <asm/dma.h>
 
@@ -121,11 +120,13 @@
 
 #define CSICR1                  0x00
 #define CSICR2                  0x04
-#define CSISR                   (cpu_is_mx27() ? 0x08 : 0x18)
+#define CSISR_IMX25             0x18
+#define CSISR_IMX27             0x08
 #define CSISTATFIFO             0x0c
 #define CSIRFIFO                0x10
 #define CSIRXCNT                0x14
-#define CSICR3                  (cpu_is_mx27() ? 0x1C : 0x08)
+#define CSICR3_IMX25            0x08
+#define CSICR3_IMX27            0x1c
 #define CSIDMASA_STATFIFO       0x20
 #define CSIDMATA_STATFIFO       0x24
 #define CSIDMASA_FB1            0x28
@@ -268,6 +269,11 @@ struct mx2_buffer {
         struct mx2_buf_internal         internal;
 };
 
+enum mx2_camera_type {
+        IMX25_CAMERA,
+        IMX27_CAMERA,
+};
+
 struct mx2_camera_dev {
         struct device           *dev;
         struct soc_camera_host  soc_host;
@@ -291,6 +297,9 @@ struct mx2_camera_dev {
         struct mx2_buffer       *fb2_active;
 
         u32                     csicr1;
+        u32                     reg_csisr;
+        u32                     reg_csicr3;
+        enum mx2_camera_type    devtype;
 
         struct mx2_buf_internal buf_discard[2];
         void                    *discard_buffer;
@@ -303,6 +312,29 @@ struct mx2_camera_dev {
         struct vb2_alloc_ctx    *alloc_ctx;
 };
 
+static struct platform_device_id mx2_camera_devtype[] = {
+        {
+                .name = "imx25-camera",
+                .driver_data = IMX25_CAMERA,
+        }, {
+                .name = "imx27-camera",
+                .driver_data = IMX27_CAMERA,
+        }, {
+                /* sentinel */
+        }
+};
+MODULE_DEVICE_TABLE(platform, mx2_camera_devtype);
+
+static inline int is_imx25_camera(struct mx2_camera_dev *pcdev)
+{
+        return pcdev->devtype == IMX25_CAMERA;
+}
+
+static inline int is_imx27_camera(struct mx2_camera_dev *pcdev)
+{
+        return pcdev->devtype == IMX27_CAMERA;
+}
+
 static struct mx2_buffer *mx2_ibuf_to_buf(struct mx2_buf_internal *int_buf)
 {
         return container_of(int_buf, struct mx2_buffer, internal);
@@ -434,9 +466,9 @@ static void mx2_camera_deactivate(struct mx2_camera_dev *pcdev)
 
         clk_disable_unprepare(pcdev->clk_csi);
         writel(0, pcdev->base_csi + CSICR1);
-        if (cpu_is_mx27()) {
+        if (is_imx27_camera(pcdev)) {
                 writel(0, pcdev->base_emma + PRP_CNTL);
-        } else if (cpu_is_mx25()) {
+        } else if (is_imx25_camera(pcdev)) {
                 spin_lock_irqsave(&pcdev->lock, flags);
                 pcdev->fb1_active = NULL;
                 pcdev->fb2_active = NULL;
@@ -466,7 +498,7 @@ static int mx2_camera_add_device(struct soc_camera_device *icd)
 
         csicr1 = CSICR1_MCLKEN;
 
-        if (cpu_is_mx27())
+        if (is_imx27_camera(pcdev))
                 csicr1 |= CSICR1_PRP_IF_EN | CSICR1_FCC |
                         CSICR1_RXFF_LEVEL(0);
 
@@ -542,7 +574,7 @@ out:
 static irqreturn_t mx25_camera_irq(int irq_csi, void *data)
 {
         struct mx2_camera_dev *pcdev = data;
-        u32 status = readl(pcdev->base_csi + CSISR);
+        u32 status = readl(pcdev->base_csi + pcdev->reg_csisr);
 
         if (status & CSISR_DMA_TSF_FB1_INT)
                 mx25_camera_frame_done(pcdev, 1, MX2_STATE_DONE);
@@ -551,7 +583,7 @@ static irqreturn_t mx25_camera_irq(int irq_csi, void *data)
 
         /* FIXME: handle CSISR_RFF_OR_INT */
 
-        writel(status, pcdev->base_csi + CSISR);
+        writel(status, pcdev->base_csi + pcdev->reg_csisr);
 
         return IRQ_HANDLED;
 }
@@ -636,7 +668,7 @@ static void mx2_videobuf_queue(struct vb2_buffer *vb)
         buf->state = MX2_STATE_QUEUED;
         list_add_tail(&buf->internal.queue, &pcdev->capture);
 
-        if (cpu_is_mx25()) {
+        if (is_imx25_camera(pcdev)) {
                 u32 csicr3, dma_inten = 0;
 
                 if (pcdev->fb1_active == NULL) {
@@ -655,20 +687,20 @@ static void mx2_videobuf_queue(struct vb2_buffer *vb)
                         list_del(&buf->internal.queue);
                         buf->state = MX2_STATE_ACTIVE;
 
-                        csicr3 = readl(pcdev->base_csi + CSICR3);
+                        csicr3 = readl(pcdev->base_csi + pcdev->reg_csicr3);
 
                         /* Reflash DMA */
                         writel(csicr3 | CSICR3_DMA_REFLASH_RFF,
-                                        pcdev->base_csi + CSICR3);
+                                        pcdev->base_csi + pcdev->reg_csicr3);
 
                         /* clear & enable interrupts */
-                        writel(dma_inten, pcdev->base_csi + CSISR);
+                        writel(dma_inten, pcdev->base_csi + pcdev->reg_csisr);
                         pcdev->csicr1 |= dma_inten;
                         writel(pcdev->csicr1, pcdev->base_csi + CSICR1);
 
                         /* enable DMA */
                         csicr3 |= CSICR3_DMA_REQ_EN_RFF | CSICR3_RXFF_LEVEL(1);
-                        writel(csicr3, pcdev->base_csi + CSICR3);
+                        writel(csicr3, pcdev->base_csi + pcdev->reg_csicr3);
                 }
         }
 
@@ -712,7 +744,7 @@ static void mx2_videobuf_release(struct vb2_buffer *vb)
          */
 
         spin_lock_irqsave(&pcdev->lock, flags);
-        if (cpu_is_mx25() && buf->state == MX2_STATE_ACTIVE) {
+        if (is_imx25_camera(pcdev) && buf->state == MX2_STATE_ACTIVE) {
                 if (pcdev->fb1_active == buf) {
                         pcdev->csicr1 &= ~CSICR1_FB1_DMA_INTEN;
                         writel(0, pcdev->base_csi + CSIDMASA_FB1);
@@ -835,7 +867,7 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count)
         unsigned long phys;
         int bytesperline;
 
-        if (cpu_is_mx27()) {
+        if (is_imx27_camera(pcdev)) {
                 unsigned long flags;
                 if (count < 2)
                         return -EINVAL;
@@ -930,7 +962,7 @@ static int mx2_stop_streaming(struct vb2_queue *q)
         void *b;
         u32 cntl;
 
-        if (cpu_is_mx27()) {
+        if (is_imx27_camera(pcdev)) {
                 spin_lock_irqsave(&pcdev->lock, flags);
 
                 cntl = readl(pcdev->base_emma + PRP_CNTL);
@@ -1082,11 +1114,11 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd)
         if (bytesperline < 0)
                 return bytesperline;
 
-        if (cpu_is_mx27()) {
+        if (is_imx27_camera(pcdev)) {
                 ret = mx27_camera_emma_prp_reset(pcdev);
                 if (ret)
                         return ret;
-        } else if (cpu_is_mx25()) {
+        } else if (is_imx25_camera(pcdev)) {
                 writel((bytesperline * icd->user_height) >> 2,
                                 pcdev->base_csi + CSIRXCNT);
                 writel((bytesperline << 16) | icd->user_height,
@@ -1392,7 +1424,7 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd,
         /* FIXME: implement MX27 limits */
 
         /* limit to MX25 hardware capabilities */
-        if (cpu_is_mx25()) {
+        if (is_imx25_camera(pcdev)) {
                 if (xlate->host_fmt->bits_per_sample <= 8)
                         width_limit = 0xffff * 4;
                 else
@@ -1726,6 +1758,20 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
                 goto exit;
         }
 
+        pcdev->devtype = pdev->id_entry->driver_data;
+        switch (pcdev->devtype) {
+        case IMX25_CAMERA:
+                pcdev->reg_csisr = CSISR_IMX25;
+                pcdev->reg_csicr3 = CSICR3_IMX25;
+                break;
+        case IMX27_CAMERA:
+                pcdev->reg_csisr = CSISR_IMX27;
+                pcdev->reg_csicr3 = CSICR3_IMX27;
+                break;
+        default:
+                break;
+        }
+
         pcdev->clk_csi = devm_clk_get(&pdev->dev, "ahb");
         if (IS_ERR(pcdev->clk_csi)) {
                 dev_err(&pdev->dev, "Could not get csi clock\n");
@@ -1763,7 +1809,7 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
         pcdev->dev = &pdev->dev;
         platform_set_drvdata(pdev, pcdev);
 
-        if (cpu_is_mx25()) {
+        if (is_imx25_camera(pcdev)) {
                 err = devm_request_irq(&pdev->dev, irq_csi, mx25_camera_irq, 0,
                                        MX2_CAM_DRV_NAME, pcdev);
                 if (err) {
@@ -1772,7 +1818,7 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
                 }
         }
 
-        if (cpu_is_mx27()) {
+        if (is_imx27_camera(pcdev)) {
                 err = mx27_camera_emma_init(pdev);
                 if (err)
                         goto exit;
@@ -1789,7 +1835,7 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
         pcdev->soc_host.priv            = pcdev;
         pcdev->soc_host.v4l2_dev.dev    = &pdev->dev;
         pcdev->soc_host.nr              = pdev->id;
-        if (cpu_is_mx25())
+        if (is_imx25_camera(pcdev))
                 pcdev->soc_host.capabilities = SOCAM_HOST_CAP_STRIDE;
 
         pcdev->alloc_ctx = vb2_dma_contig_init_ctx(&pdev->dev);
@@ -1809,7 +1855,7 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
 exit_free_emma:
         vb2_dma_contig_cleanup_ctx(pcdev->alloc_ctx);
 eallocctx:
-        if (cpu_is_mx27()) {
+        if (is_imx27_camera(pcdev)) {
                 clk_disable_unprepare(pcdev->clk_emma_ipg);
                 clk_disable_unprepare(pcdev->clk_emma_ahb);
         }
@@ -1827,7 +1873,7 @@ static int __devexit mx2_camera_remove(struct platform_device *pdev)
 
         vb2_dma_contig_cleanup_ctx(pcdev->alloc_ctx);
 
-        if (cpu_is_mx27()) {
+        if (is_imx27_camera(pcdev)) {
                 clk_disable_unprepare(pcdev->clk_emma_ipg);
                 clk_disable_unprepare(pcdev->clk_emma_ahb);
         }
@@ -1841,6 +1887,7 @@ static struct platform_driver mx2_camera_driver = {
         .driver         = {
                 .name   = MX2_CAM_DRV_NAME,
         },
+        .id_table       = mx2_camera_devtype,
         .remove         = __devexit_p(mx2_camera_remove),
 };
 
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index 3557ac97e430..64d39b1b5582 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -17,6 +17,7 @@
 #include <linux/vmalloc.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
+#include <linux/dma/ipu-dma.h>
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-dev.h>
@@ -24,7 +25,6 @@
 #include <media/soc_camera.h>
 #include <media/soc_mediabus.h>
 
-#include <mach/ipu.h>
 #include <linux/platform_data/camera-mx3.h>
 #include <linux/platform_data/dma-imx.h>
 
diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c
index fa08c7695ccb..cae9ce6275e9 100644
--- a/drivers/media/platform/soc_camera/omap1_camera.c
+++ b/drivers/media/platform/soc_camera/omap1_camera.c
@@ -34,12 +34,13 @@
 #include <media/videobuf-dma-contig.h>
 #include <media/videobuf-dma-sg.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 
 #define DRIVER_NAME             "omap1-camera"
 #define DRIVER_VERSION          "0.0.2"
 
+#define OMAP_DMA_CAMERA_IF_RX           20
 
 /*
  * ---------------------------------------------------------------------------
diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
index 546199e9ccc7..82e6c1e282d5 100644
--- a/drivers/media/rc/ir-rx51.c
+++ b/drivers/media/rc/ir-rx51.c
@@ -28,7 +28,6 @@
 
 #include <plat/dmtimer.h>
 #include <plat/clock.h>
-#include <plat/omap-pm.h>
 
 #include <media/lirc.h>
 #include <media/lirc_dev.h>