| Message ID | 20201016105038.158774-1-naush@raspberrypi.com |
|---|---|
| State | Accepted |
| Commit | 696aefe0c9ac0e07541a7dbd9334cb282743d29a |
| Headers | show |
| Series |
|
| Related | show |
Hi Naush, Thank you for the patch. On Fri, Oct 16, 2020 at 11:50:38AM +0100, Naushir Patuck wrote: > The V4L2_CID_USER_BCM2835_ISP_BASE has changed in the downstream > Raspberry Pi 5.9 kernel to match the upstream defines, see here: > https://github.com/raspberrypi/linux/pull/3897. > > Note, that this will cause an ABI breakage with the current downstream > Raspberry Pi 5.4 kernel until both this change and the following PR has > been merged: https://github.com/raspberrypi/linux/pull/3897 I see that the pull request has been merged, so I'll merge this as well. > Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > include/linux/v4l2-controls.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h > index 24eea2b6..39f4bcb5 100644 > --- a/include/linux/v4l2-controls.h > +++ b/include/linux/v4l2-controls.h > @@ -192,9 +192,15 @@ enum v4l2_colorfx { > * We reserve 16 controls for this driver. */ > #define V4L2_CID_USER_IMX_BASE (V4L2_CID_USER_BASE + 0x10b0) > > +/* > + * The base for the atmel isc driver controls. > + * We reserve 32 controls for this driver. > + */ > +#define V4L2_CID_USER_ATMEL_ISC_BASE (V4L2_CID_USER_BASE + 0x10c0) > + > /* The base for the bcm2835-isp driver controls. > * We reserve 16 controls for this driver. */ > -#define V4L2_CID_USER_BCM2835_ISP_BASE (V4L2_CID_USER_BASE + 0x10c0) > +#define V4L2_CID_USER_BCM2835_ISP_BASE (V4L2_CID_USER_BASE + 0x10e0) > > /* MPEG-class control IDs */ > /* The MPEG controls are applicable to all codec controls
diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index 24eea2b6..39f4bcb5 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h @@ -192,9 +192,15 @@ enum v4l2_colorfx { * We reserve 16 controls for this driver. */ #define V4L2_CID_USER_IMX_BASE (V4L2_CID_USER_BASE + 0x10b0) +/* + * The base for the atmel isc driver controls. + * We reserve 32 controls for this driver. + */ +#define V4L2_CID_USER_ATMEL_ISC_BASE (V4L2_CID_USER_BASE + 0x10c0) + /* The base for the bcm2835-isp driver controls. * We reserve 16 controls for this driver. */ -#define V4L2_CID_USER_BCM2835_ISP_BASE (V4L2_CID_USER_BASE + 0x10c0) +#define V4L2_CID_USER_BCM2835_ISP_BASE (V4L2_CID_USER_BASE + 0x10e0) /* MPEG-class control IDs */ /* The MPEG controls are applicable to all codec controls
The V4L2_CID_USER_BCM2835_ISP_BASE has changed in the downstream Raspberry Pi 5.9 kernel to match the upstream defines, see here: https://github.com/raspberrypi/linux/pull/3897. Note, that this will cause an ABI breakage with the current downstream Raspberry Pi 5.4 kernel until both this change and the following PR has been merged: https://github.com/raspberrypi/linux/pull/3897 Signed-off-by: Naushir Patuck <naush@raspberrypi.com> --- include/linux/v4l2-controls.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)