v4l-utils: Remove MEDIA_BUS_FMT_Y16_1X16 from Xilinx specific formats

MEDIA_BUS_FMT_Y16_1X16 is part of upstream now.[1]

[1] https://github.com/gjasny/v4l-utils/blob/4aee01a027923cab1e40969f56f8ba58d3e6c0d1/include/linux/media-bus-format.h#L99

Signed-off-by: Adrian Fiergolski <Adrian.Fiergolski@fastree3d.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 16 insertions, 18 deletions

diff --git a/meta-xilinx-multimedia/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch b/meta-xilinx-multimedia/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch
index fac2d719..fcbd31ba 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch
+++ b/meta-xilinx-multimedia/recipes-multimedia/v4l2apps/files/0001-v4l-utils-Add-support-for-new-media-bus-codes.patch
@@ -1,4 +1,4 @@
-From 373923a8cddb0b1854d3040a6ba0cf016a244128 Mon Sep 17 00:00:00 2001
+From 1e1afa48034869d4a1520c405b56c3a574b3f4ba Mon Sep 17 00:00:00 2001
 From: Anil Kumar M <amamidal@xilinx.com>
 Date: Mon, 24 Feb 2020 14:45:46 +0530
 Subject: [PATCH] v4l-utils: Add support for new media bus codes
@@ -7,29 +7,28 @@ Add new media bus format codes for supporting xilinx
 specific formats.
 
 Signed-off-by: Anil Kumar M <amamidal@xilinx.com>
+Signed-off-by: Adrian Fiergolski <Adrian.Fiergolski@fastree3d.com>
 ---
- include/linux/media-bus-format.h | 12 ++++++++++++
- utils/media-ctl/libv4l2subdev.c  | 11 +++++++++++
- 2 files changed, 23 insertions(+)
+ include/linux/media-bus-format.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
 
 diff --git a/include/linux/media-bus-format.h b/include/linux/media-bus-format.h
-index d6a5a3b..3fb2346 100644
+index f05f747e..45f6707d 100644
 --- a/include/linux/media-bus-format.h
 +++ b/include/linux/media-bus-format.h
-@@ -108,6 +108,18 @@
+@@ -121,6 +121,17 @@
  #define MEDIA_BUS_FMT_YUV16_1X48               0x202a
  #define MEDIA_BUS_FMT_UYYVYY16_0_5X48          0x202b
-
-+/* YUV: Xilinx Specific - next is       0x2109 */
+ 
++/* YUV: Xilinx Specific - next is       0x2108 */
 +#define MEDIA_BUS_FMT_VYYUYY8_1X24             0x2100
 +#define MEDIA_BUS_FMT_VYYUYY10_4X20            0x2101
 +#define MEDIA_BUS_FMT_VUY10_1X30               0x2102
 +#define MEDIA_BUS_FMT_UYYVYY12_4X24            0x2103
 +#define MEDIA_BUS_FMT_VUY12_1X36               0x2104
-+#define MEDIA_BUS_FMT_Y16_1X16                 0x2105
-+#define MEDIA_BUS_FMT_UYYVYY16_4X32            0x2106
-+#define MEDIA_BUS_FMT_VUY16_1X48               0x2107
-+#define MEDIA_BUS_FMT_UYVY16_2X32              0x2108
++#define MEDIA_BUS_FMT_UYYVYY16_4X32            0x2105
++#define MEDIA_BUS_FMT_VUY16_1X48               0x2106
++#define MEDIA_BUS_FMT_UYVY16_2X32              0x2107
 +
 +
  /* Bayer - next is     0x3021 */
@@ -39,20 +38,19 @@ diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
 index a989efb..a37541f 100644
 --- a/utils/media-ctl/libv4l2subdev.c
 +++ b/utils/media-ctl/libv4l2subdev.c
-@@ -34,6 +34,17 @@
+@@ -34,6 +34,16 @@
 
  #include <linux/v4l2-subdev.h>
 
-+/* YUV: Xilinx Specific - next is 0x2109 */
++/* YUV: Xilinx Specific - next is 0x2108 */
 +#define MEDIA_BUS_FMT_VYYUYY8_1X24     (0x2100)
 +#define MEDIA_BUS_FMT_VYYUYY10_4X20    (0x2101)
 +#define MEDIA_BUS_FMT_VUY10_1X30       (0x2102)
 +#define MEDIA_BUS_FMT_UYYVYY12_4X24    (0x2103)
 +#define MEDIA_BUS_FMT_VUY12_1X36       (0x2104)
-+#define MEDIA_BUS_FMT_Y16_1X16         (0x2105)
-+#define MEDIA_BUS_FMT_UYYVYY16_4X32    (0x2106)
-+#define MEDIA_BUS_FMT_VUY16_1X48       (0x2107)
-+#define MEDIA_BUS_FMT_UYVY16_2X32      (0x2108)
++#define MEDIA_BUS_FMT_UYYVYY16_4X32    (0x2105)
++#define MEDIA_BUS_FMT_VUY16_1X48       (0x2106)
++#define MEDIA_BUS_FMT_UYVY16_2X32      (0x2107)
 +
  #include "mediactl.h"
  #include "mediactl-priv.h"