[PATCH 02/15] [media] v4l: Update subdev-formats doc with new MEDIA_BUS_FMT values

2014-11-04 Thread Boris Brezillon
In order to have subsytem agnostic media bus format definitions we've
moved media bus definition to include/uapi/linux/media-bus-format.h and
prefixed enum values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.

Update the v4l documentation accordingly.

Signed-off-by: Boris Brezillon 
---
 Documentation/DocBook/media/Makefile   |   2 +-
 Documentation/DocBook/media/v4l/subdev-formats.xml | 308 ++---
 include/uapi/linux/v4l2-mediabus.h |   2 +
 3 files changed, 157 insertions(+), 155 deletions(-)

diff --git a/Documentation/DocBook/media/Makefile 
b/Documentation/DocBook/media/Makefile
index 8bf7c61..181b7f4 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -86,7 +86,7 @@ ENUMS = \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' 
$(srctree)/include/uapi/linux/dvb/net.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' 
$(srctree)/include/uapi/linux/dvb/video.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' 
$(srctree)/include/uapi/linux/media.h) \
-   $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' 
$(srctree)/include/uapi/linux/v4l2-mediabus.h) \
+   $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' 
$(srctree)/include/uapi/linux/media-bus-format.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' 
$(srctree)/include/uapi/linux/v4l2-subdev.h)
 
 STRUCTS = \
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml 
b/Documentation/DocBook/media/v4l/subdev-formats.xml
index b2d5a03..18730b9 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -86,7 +86,7 @@
   green and 5-bit blue values padded on the high bit, transferred as 2 
8-bit
   samples per pixel with the most significant bits (padding, red and half 
of
   the green value) transferred first will be named
-  V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE.
+  MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE.
   
 
   The following tables list existing packed RGB formats.
@@ -176,8 +176,8 @@

  
  
-   
- V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE
+   
+ MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE
  0x1001
  
  &dash-ent-24;
@@ -204,8 +204,8 @@
  b1
  b0

-   
- V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE
+   
+ MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE
  0x1002
  
  &dash-ent-24;
@@ -232,8 +232,8 @@
  r1
  r0

-   
- V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE
+   
+ MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE
  0x1003
  
  &dash-ent-24;
@@ -260,8 +260,8 @@
  b1
  b0

-   
- V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE
+   
+ MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE
  0x1004
  
  &dash-ent-24;
@@ -288,8 +288,8 @@
  g4
  g3

-   
- V4L2_MBUS_FMT_BGR565_2X8_BE
+   
+ MEDIA_BUS_FMT_BGR565_2X8_BE
  0x1005
  
  &dash-ent-24;
@@ -316,8 +316,8 @@
  r1
  r0

-   
- V4L2_MBUS_FMT_BGR565_2X8_LE
+   
+ MEDIA_BUS_FMT_BGR565_2X8_LE
  0x1006
  
  &dash-ent-24;
@@ -344,8 +344,8 @@
  g4
  g3

-   
- V4L2_MBUS_FMT_RGB565_2X8_BE
+   
+ MEDIA_BUS_FMT_RGB565_2X8_BE
  0x1007
  
  &dash-ent-24;
@@ -372,8 +372,8 @@
  b1
  b0

-   
- V4L2_MBUS_FMT_RGB565_2X8_LE
+   
+ MEDIA_BUS_FMT_RGB565_2X8_LE
  0x1008
  
  &dash-ent-24;
@@ -400,8 +400,8 @@
  g4
  g3

-   
- V4L2_MBUS_FMT_RGB666_1X18
+   
+ MEDIA_BUS_FMT_RGB666_1X18
  0x1009
  
  &dash-ent-14;
@@ -424,8 +424,8 @@
  b1
  b0

-   
- V4L2_MBUS_FMT_RGB888_1X24
+   
+ MEDIA_BUS_FMT_RGB888_1X24
  0x100a
  
  &dash-ent-8;
@@ -454,8 +454,8 @@
  b1
  b0

-   
- V4L2_MBUS_FMT_RGB888_2X12_BE
+   
+ MEDIA_BUS_FMT_RGB888_2X12_BE
  0x100b
  
  &dash-ent-20;
@@ -490,8 +490,8 @@
  b1
  b0

-   
- V4L2_MBUS_FMT_RGB888_2X12_LE
+   
+ MEDIA_BUS_FMT_RGB888_2X12_LE
  0x10

Re: [PATCH 02/15] [media] v4l: Update subdev-formats doc with new MEDIA_BUS_FMT values

2014-11-05 Thread Sakari Ailus
Hi Boris,

On Tue, Nov 04, 2014 at 10:54:57AM +0100, Boris Brezillon wrote:
> In order to have subsytem agnostic media bus format definitions we've
> moved media bus definition to include/uapi/linux/media-bus-format.h and
> prefixed enum values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.
> 
> Update the v4l documentation accordingly.
> 
> Signed-off-by: Boris Brezillon 
> ---
>  Documentation/DocBook/media/Makefile   |   2 +-
>  Documentation/DocBook/media/v4l/subdev-formats.xml | 308 
> ++---
>  include/uapi/linux/v4l2-mediabus.h |   2 +
>  3 files changed, 157 insertions(+), 155 deletions(-)
> 

...

> diff --git a/include/uapi/linux/v4l2-mediabus.h 
> b/include/uapi/linux/v4l2-mediabus.h
> index f471064..9fbe891 100644
> --- a/include/uapi/linux/v4l2-mediabus.h
> +++ b/include/uapi/linux/v4l2-mediabus.h
> @@ -32,6 +32,8 @@ enum v4l2_mbus_pixelcode {
>   MEDIA_BUS_TO_V4L2_MBUS(RGB888_2X12_BE),
>   MEDIA_BUS_TO_V4L2_MBUS(RGB888_2X12_LE),
>   MEDIA_BUS_TO_V4L2_MBUS(ARGB_1X32),
> + MEDIA_BUS_TO_V4L2_MBUS(RGB444_1X12),
> + MEDIA_BUS_TO_V4L2_MBUS(RGB565_1X16),

Shouldn't this to go to a separate patch?

>  
>   MEDIA_BUS_TO_V4L2_MBUS(Y8_1X8),
>   MEDIA_BUS_TO_V4L2_MBUS(UV8_1X8),

-- 
Kind regards,

Sakari Ailus
e-mail: sakari.ai...@iki.fi XMPP: sai...@retiisi.org.uk
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 02/15] [media] v4l: Update subdev-formats doc with new MEDIA_BUS_FMT values

2014-11-05 Thread Boris Brezillon
Hi Sakari,

On Wed, 5 Nov 2014 16:57:27 +0200
Sakari Ailus  wrote:

> Hi Boris,
> 
> On Tue, Nov 04, 2014 at 10:54:57AM +0100, Boris Brezillon wrote:
> > In order to have subsytem agnostic media bus format definitions we've
> > moved media bus definition to include/uapi/linux/media-bus-format.h and
> > prefixed enum values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.
> > 
> > Update the v4l documentation accordingly.
> > 
> > Signed-off-by: Boris Brezillon 
> > ---
> >  Documentation/DocBook/media/Makefile   |   2 +-
> >  Documentation/DocBook/media/v4l/subdev-formats.xml | 308 
> > ++---
> >  include/uapi/linux/v4l2-mediabus.h |   2 +
> >  3 files changed, 157 insertions(+), 155 deletions(-)
> > 
> 
> ...
> 
> > diff --git a/include/uapi/linux/v4l2-mediabus.h 
> > b/include/uapi/linux/v4l2-mediabus.h
> > index f471064..9fbe891 100644
> > --- a/include/uapi/linux/v4l2-mediabus.h
> > +++ b/include/uapi/linux/v4l2-mediabus.h
> > @@ -32,6 +32,8 @@ enum v4l2_mbus_pixelcode {
> > MEDIA_BUS_TO_V4L2_MBUS(RGB888_2X12_BE),
> > MEDIA_BUS_TO_V4L2_MBUS(RGB888_2X12_LE),
> > MEDIA_BUS_TO_V4L2_MBUS(ARGB_1X32),
> > +   MEDIA_BUS_TO_V4L2_MBUS(RGB444_1X12),
> > +   MEDIA_BUS_TO_V4L2_MBUS(RGB565_1X16),
> 
> Shouldn't this to go to a separate patch?

Absolutely, some changes from a different patch have slipped into this
one.

I'll fix that.

Thanks,

Boris

-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html