diff options
| author | Steve Longerbeam <slongerbeam@gmail.com> | 2017-06-10 16:00:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-06-20 07:30:38 -0300 |
| commit | e130291212df5ce8160cd2e35387c96439863ad3 (patch) | |
| tree | 9a526f0f115eab856de3bdc39f58fe61a7a1e1f1 /include | |
| parent | a2bce3794a2122425abce5b0359d075b790930bc (diff) | |
| download | linux-stable-e130291212df5ce8160cd2e35387c96439863ad3.tar.gz linux-stable-e130291212df5ce8160cd2e35387c96439863ad3.tar.bz2 linux-stable-e130291212df5ce8160cd2e35387c96439863ad3.zip | |
[media] media: Add i.MX media core driver
Add the core media driver for i.MX SOC.
Switch from the v4l2_of_ APIs to the v4l2_fwnode_ APIs.
Add the bayer formats to imx-media's list of supported pixel and bus
formats.
Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/imx.h | 15 | ||||
| -rw-r--r-- | include/uapi/linux/v4l2-controls.h | 4 |
2 files changed, 19 insertions, 0 deletions
diff --git a/include/media/imx.h b/include/media/imx.h new file mode 100644 index 000000000000..6e5f50d35f89 --- /dev/null +++ b/include/media/imx.h @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2014-2017 Mentor Graphics Inc. + * + * 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 + */ + +#ifndef __MEDIA_IMX_H__ +#define __MEDIA_IMX_H__ + +#include <linux/imx-media.h> + +#endif diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 83b28b41123f..8cadcece7a29 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -185,6 +185,10 @@ enum v4l2_colorfx { */ #define V4L2_CID_USER_MAX217X_BASE (V4L2_CID_USER_BASE + 0x1090) +/* The base for the imx driver controls. + * We reserve 16 controls for this driver. */ +#define V4L2_CID_USER_IMX_BASE (V4L2_CID_USER_BASE + 0x1090) + /* MPEG-class control IDs */ /* The MPEG controls are applicable to all codec controls * and the 'MPEG' part of the define is historical */ |