4 files changed, 136 insertions, 3 deletions

diff --git a/drivers/media/video/uvc/Makefile b/drivers/media/video/uvc/Makefile
index 968c1994eda0..2071ca8a2f03 100644
--- a/drivers/media/video/uvc/Makefile
+++ b/drivers/media/video/uvc/Makefile
@@ -1,3 +1,6 @@
 uvcvideo-objs  := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \
                   uvc_status.o uvc_isight.o
+ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
+uvcvideo-objs  += uvc_entity.o
+endif
 obj-$(CONFIG_USB_VIDEO_CLASS) += uvcvideo.o
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 0e8cd1fd870f..0bf3413e8d37 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -248,7 +248,7 @@ uint32_t uvc_fraction_to_interval(uint32_t numerator, uint32_t denominator)
  * Terminal and unit management
  */
 
-static struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id)
+struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id)
 {
         struct uvc_entity *entity;
 
@@ -795,9 +795,12 @@ static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id,
         struct uvc_entity *entity;
         unsigned int num_inputs;
         unsigned int size;
+        unsigned int i;
 
+        extra_size = ALIGN(extra_size, sizeof(*entity->pads));
         num_inputs = (type & UVC_TERM_OUTPUT) ? num_pads : num_pads - 1;
-        size = sizeof(*entity) + extra_size + num_inputs;
+        size = sizeof(*entity) + extra_size + sizeof(*entity->pads) * num_pads
+             + num_inputs;
         entity = kzalloc(size, GFP_KERNEL);
         if (entity == NULL)
                 return NULL;
@@ -805,8 +808,17 @@ static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id,
         entity->id = id;
         entity->type = type;
 
+        entity->num_links = 0;
+        entity->num_pads = num_pads;
+        entity->pads = ((void *)(entity + 1)) + extra_size;
+
+        for (i = 0; i < num_inputs; ++i)
+                entity->pads[i].flags = MEDIA_PAD_FL_SINK;
+        if (!UVC_ENTITY_IS_OTERM(entity))
+                entity->pads[num_pads-1].flags = MEDIA_PAD_FL_SOURCE;
+
         entity->bNrInPins = num_inputs;
-        entity->baSourceID = ((__u8 *)entity) + sizeof(*entity) + extra_size;
+        entity->baSourceID = (__u8 *)(&entity->pads[num_pads]);
 
         return entity;
 }
@@ -1601,6 +1613,9 @@ static void uvc_delete(struct uvc_device *dev)
         list_for_each_safe(p, n, &dev->entities) {
                 struct uvc_entity *entity;
                 entity = list_entry(p, struct uvc_entity, list);
+#ifdef CONFIG_MEDIA_CONTROLLER
+                uvc_mc_cleanup_entity(entity);
+#endif
                 kfree(entity);
         }
 
@@ -1752,6 +1767,14 @@ static int uvc_register_chains(struct uvc_device *dev)
                 ret = uvc_register_terms(dev, chain);
                 if (ret < 0)
                         return ret;
+
+#ifdef CONFIG_MEDIA_CONTROLLER
+                ret = uvc_mc_register_entities(chain);
+                if (ret < 0) {
+                        uvc_printk(KERN_INFO, "Failed to register entites "
+                                "(%d).\n", ret);
+                }
+#endif
         }
 
         return 0;
diff --git a/drivers/media/video/uvc/uvc_entity.c b/drivers/media/video/uvc/uvc_entity.c
new file mode 100644
index 000000000000..8e8e7efb4608
--- /dev/null
+++ b/drivers/media/video/uvc/uvc_entity.c
@@ -0,0 +1,94 @@
+/*
+ *      uvc_entity.c  --  USB Video Class driver
+ *
+ *      Copyright (C) 2005-2011
+ *          Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ *      This program is free software; you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/videodev2.h>
+
+#include <media/v4l2-common.h>
+
+#include "uvcvideo.h"
+
+/* ------------------------------------------------------------------------
+ * Video subdevices registration and unregistration
+ */
+
+static int uvc_mc_register_entity(struct uvc_video_chain *chain,
+        struct uvc_entity *entity)
+{
+        const u32 flags = MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE;
+        struct uvc_entity *remote;
+        unsigned int i;
+        u8 remote_pad;
+        int ret;
+
+        for (i = 0; i < entity->num_pads; ++i) {
+                if (!(entity->pads[i].flags & MEDIA_PAD_FL_SINK))
+                        continue;
+
+                remote = uvc_entity_by_id(chain->dev, entity->baSourceID[i]);
+                if (remote == NULL)
+                        return -EINVAL;
+
+                remote_pad = remote->num_pads - 1;
+                ret = media_entity_create_link(&remote->subdev.entity,
+                                remote_pad, &entity->subdev.entity, i, flags);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return v4l2_device_register_subdev(&chain->dev->vdev, &entity->subdev);
+}
+
+static struct v4l2_subdev_ops uvc_subdev_ops = {
+};
+
+void uvc_mc_cleanup_entity(struct uvc_entity *entity)
+{
+        media_entity_cleanup(&entity->subdev.entity);
+}
+
+static int uvc_mc_init_entity(struct uvc_entity *entity)
+{
+        v4l2_subdev_init(&entity->subdev, &uvc_subdev_ops);
+        strlcpy(entity->subdev.name, entity->name, sizeof(entity->subdev.name));
+
+        return media_entity_init(&entity->subdev.entity, entity->num_pads,
+                                 entity->pads, 0);
+}
+
+int uvc_mc_register_entities(struct uvc_video_chain *chain)
+{
+        struct uvc_entity *entity;
+        int ret;
+
+        list_for_each_entry(entity, &chain->entities, chain) {
+                ret = uvc_mc_init_entity(entity);
+                if (ret < 0) {
+                        uvc_printk(KERN_INFO, "Failed to initialize entity for "
+                                   "entity %u\n", entity->id);
+                        return ret;
+                }
+        }
+
+        list_for_each_entry(entity, &chain->entities, chain) {
+                ret = uvc_mc_register_entity(chain, entity);
+                if (ret < 0) {
+                        uvc_printk(KERN_INFO, "Failed to register entity for "
+                                   "entity %u\n", entity->id);
+                        return ret;
+                }
+        }
+
+        return 0;
+}
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index aab7508f2bd2..3906f6ed4061 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/