[PATCH] media: v4l2-ctrls: Fix CID base conflict between MAX217X and IMX

[PATCH] media: v4l2-ctrls: Fix CID base conflict between MAX217X and IMX

[Steve Longerbeam]

When the imx-media driver was initially merged, there was a conflict
with 8d67ae25 ("media: v4l2-ctrls: Reserve controls for MAX217X") which
was not fixed up correctly, resulting in V4L2_CID_USER_MAX217X_BASE and
V4L2_CID_USER_IMX_BASE taking on the same value. Fix by assigning imx
CID base the next available range at 0x10b0.

Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
---
 include/uapi/linux/v4l2-controls.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 8d473c9..8a75ad7 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -188,7 +188,7 @@ enum v4l2_colorfx {
 
 /* 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)
+#define V4L2_CID_USER_IMX_BASE			(V4L2_CID_USER_BASE + 0x10b0)
 
 /* MPEG-class control IDs */
 /* The MPEG controls are applicable to all codec controls
-- 
2.7.4

Re: [PATCH] media: v4l2-ctrls: Fix CID base conflict between MAX217X and IMX

[Sakari Ailus]

On Wed, Jun 27, 2018 at 11:39:43AM -0700, Steve Longerbeam wrote:
> When the imx-media driver was initially merged, there was a conflict
> with 8d67ae25 ("media: v4l2-ctrls: Reserve controls for MAX217X") which
> was not fixed up correctly, resulting in V4L2_CID_USER_MAX217X_BASE and
> V4L2_CID_USER_IMX_BASE taking on the same value. Fix by assigning imx
> CID base the next available range at 0x10b0.
> 
> Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>

Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>

-- 
Sakari Ailus
e-mail: sakari.ailus@iki.fi