summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/Makefile
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2017-06-07 20:33:55 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-06-20 12:19:49 +0200
commit68803ad4522f5defc091c29f75665d942f2d5e82 (patch)
tree57db5fc6855db7a79c05936324a134749576f7a1 /drivers/media/platform/Makefile
parent[media] add mux and video interface bridge entity functions (diff)
downloadlinux-68803ad4522f5defc091c29f75665d942f2d5e82.tar.xz
linux-68803ad4522f5defc091c29f75665d942f2d5e82.zip
[media] platform: add video-multiplexer subdevice driver
This driver can handle SoC internal and external video bus multiplexers, controlled by mux controllers provided by the mux controller framework, such as MMIO register bitfields or GPIOs. The subdevice passes through the mbus configuration of the active input to the output side. Since the mux framework is not yet merged, this driver contains temporary mmio-mux support to work without the framework. The driver should be converted to use the multiplexer API once the "mux: minimal mux subsystem" and "mux: mmio-based syscon mux controller" patches are merged. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Acked-by: Pavel Machek <pavel@ucw.cz> [hans.verkuil@cisco.com: add 'select REGMAP' to Kconfig] Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/Makefile')
-rw-r--r--drivers/media/platform/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 349ccffb49db..ba7981d6f3c5 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -28,6 +28,8 @@ obj-$(CONFIG_VIDEO_SH_VEU) += sh_veu.o
obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
+obj-$(CONFIG_VIDEO_MUX) += video-mux.o
+
obj-$(CONFIG_VIDEO_S3C_CAMIF) += s3c-camif/
obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg/