linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
drivers/media/v4l2-core/videobuf-vmalloc.c
between commit:
77512baaea9a ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
237")
from Linus' tree and commit:
513dbd35b5d9 ("media: add SPDX headers to some files")
from the v4l-dvb tree.
I fixed it up (I used the former's SPDX line (GPL-2.0-only v. GPL-2.0),
but the latter's Copyright line) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
pgpAsNS_XXTD3.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi all,
Today's linux-next merge of the v4l-dvb tree got conflicts in:
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
drivers/media/platform/mtk-vcodec/vdec_drv_base.h
drivers/media/platform/mtk-vcodec/vdec_drv_if.c
drivers/media/platform/mtk-vcodec/vdec_drv_if.h
drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
drivers/media/platform/mtk-vcodec/venc_drv_base.h
drivers/media/platform/mtk-vcodec/venc_drv_if.c
drivers/media/platform/mtk-vcodec/venc_drv_if.h
drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
drivers/media/platform/mtk-vcodec/venc_vpu_if.c
drivers/media/platform/mtk-vcodec/venc_vpu_if.h
between commit:
1802d0beecaf ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
174")
from Linus' tree and commit:
9293e39c5d7f ("media: mtk-vcodec: replace GPLv2 with SPDX")
from the v4l-dvb tree.
I fixed it up (I just iused the versions from the v4l-dvb tree -
although I think that they may have gone to far in removing copyright
notices as well as the license boilerplate) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgp7Ebz1jegkh.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi all,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
drivers/media/platform/coda/Makefile
between commit:
ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")
from Linus' tree and commit:
94b7ddb91c16 ("media: coda: remove -I$(src) header search path")
from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/media/platform/coda/Makefile
index f13adacd924e,3eed82137257..
--- a/drivers/media/platform/coda/Makefile
+++ b/drivers/media/platform/coda/Makefile
@@@ -1,6 -1,3 +1,5 @@@
+# SPDX-License-Identifier: GPL-2.0-only
- ccflags-y += -I$(src)
+
coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-jpeg.o
obj-$(CONFIG_VIDEO_CODA) += coda.o
pgpGYOfqC4uTN.pgp
Description: OpenPGP digital signature
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi all,
On Fri, 1 Feb 2019 10:22:33 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
>
> drivers/media/platform/vim2m.c
>
> between commit:
>
> 240809ef6630 ("media: vim2m: only cancel work if it is for right context")
>
> from Linus' tree and commit:
>
> b3e64e5b0778 ("media: vim2m: use per-file handler work queue")
>
> from the v4l-dvb tree.
>
> I fixed it up (I think - see below) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>
> diff --cc drivers/media/platform/vim2m.c
> index 89d9c4c21037,e31c14c7d37f..
> --- a/drivers/media/platform/vim2m.c
> +++ b/drivers/media/platform/vim2m.c
> @@@ -806,10 -904,7 +904,9 @@@ static void vim2m_stop_streaming(struc
> struct vb2_v4l2_buffer *vbuf;
> unsigned long flags;
>
> -cancel_delayed_work_sync(>work_run);
> +if (v4l2_m2m_get_curr_priv(dev->m2m_dev) == ctx)
> - cancel_delayed_work_sync(>work_run);
> ++cancel_delayed_work_sync(>work_run);
> +
> for (;;) {
> if (V4L2_TYPE_IS_OUTPUT(q->type))
> vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
Well, that wasn't right, so instead I just effectively reverted the
commit from Linus' tree ...
--
Cheers,
Stephen Rothwell
pgpmmEx1r8V6o.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi all,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
drivers/media/platform/vim2m.c
between commit:
240809ef6630 ("media: vim2m: only cancel work if it is for right context")
from Linus' tree and commit:
b3e64e5b0778 ("media: vim2m: use per-file handler work queue")
from the v4l-dvb tree.
I fixed it up (I think - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/media/platform/vim2m.c
index 89d9c4c21037,e31c14c7d37f..
--- a/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@@ -806,10 -904,7 +904,9 @@@ static void vim2m_stop_streaming(struc
struct vb2_v4l2_buffer *vbuf;
unsigned long flags;
- cancel_delayed_work_sync(>work_run);
+ if (v4l2_m2m_get_curr_priv(dev->m2m_dev) == ctx)
- cancel_delayed_work_sync(>work_run);
++ cancel_delayed_work_sync(>work_run);
+
for (;;) {
if (V4L2_TYPE_IS_OUTPUT(q->type))
vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
pgp4ZiH6lY7Hc.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
Documentation/DocBook/Makefile
between commit:
88e196b337d6 ("Documentation/DocBook: remove gpu.tmpl")
from Linus' tree and commit:
43f71d93a0cb ("doc-rst: Remove the media docbook")
from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/DocBook/Makefile
index 8e6dd4b14314,2bfd664b5e35..
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -16,11 -16,9 +16,9 @@@ DOCBOOKS := z8530book.xml device-driver
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
80211.xml debugobjects.xml sh.xml regulator.xml \
alsa-driver-api.xml writing-an-alsa-driver.xml \
- tracepoint.xml media_api.xml w1.xml \
- tracepoint.xml gpu.xml w1.xml \
++ tracepoint.xml w1.xml \
writing_musb_glue_layer.xml crypto-API.xml iio.xml
- include Documentation/DocBook/media/Makefile
-
###
# The build process is as follows (targets):
# (xmldocs) [by docproc]
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
Documentation/DocBook/Makefile
between commit:
88e196b337d6 ("Documentation/DocBook: remove gpu.tmpl")
from Linus' tree and commit:
43f71d93a0cb ("doc-rst: Remove the media docbook")
from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/DocBook/Makefile
index 8e6dd4b14314,2bfd664b5e35..
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -16,11 -16,9 +16,9 @@@ DOCBOOKS := z8530book.xml device-driver
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
80211.xml debugobjects.xml sh.xml regulator.xml \
alsa-driver-api.xml writing-an-alsa-driver.xml \
- tracepoint.xml media_api.xml w1.xml \
- tracepoint.xml gpu.xml w1.xml \
++ tracepoint.xml w1.xml \
writing_musb_glue_layer.xml crypto-API.xml iio.xml
- include Documentation/DocBook/media/Makefile
-
###
# The build process is as follows (targets):
# (xmldocs) [by docproc]
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
mm/Makefile
between commit:
c1a4de99fada ("userfaultfd: mcopy_atomic|mfill_zeropage:
UFFDIO_COPY|UFFDIO_ZEROPAGE preparation")
from Linus' tree and commit:
8025e5ddf9c1 ("[media] mm: Provide new get_vaddr_frames() helper")
from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc mm/Makefile
index b424d5e5b6ff,be5d5c866305..
--- a/mm/Makefile
+++ b/mm/Makefile
@@@ -78,4 -78,4 +78,5 @@@ obj-$(CONFIG_CMA) += cma.
obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o
obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o
obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o
+obj-$(CONFIG_USERFAULTFD) += userfaultfd.o
+ obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
mm/Makefile
between commit:
c1a4de99fada ("userfaultfd: mcopy_atomic|mfill_zeropage:
UFFDIO_COPY|UFFDIO_ZEROPAGE preparation")
from Linus' tree and commit:
8025e5ddf9c1 ("[media] mm: Provide new get_vaddr_frames() helper")
from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc mm/Makefile
index b424d5e5b6ff,be5d5c866305..
--- a/mm/Makefile
+++ b/mm/Makefile
@@@ -78,4 -78,4 +78,5 @@@ obj-$(CONFIG_CMA) += cma.
obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o
obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o
obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o
+obj-$(CONFIG_USERFAULTFD) += userfaultfd.o
+ obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Am Dienstag, den 21.04.2015, 10:12 -0300 schrieb Mauro Carvalho Chehab:
> Em Tue, 21 Apr 2015 15:38:02 +0300
> Laurent Pinchart escreveu:
>
> > Hi Mauro,
> >
> > On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote:
> > > Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu:
> > > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote:
> > > > > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
> > > > > > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
> > > > > > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c
> > > > > > +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d
> > > > > > +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e
> > > > > > +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f
> > > > >
> > > > > The above 6 lines introduce duplicate defines, you can remove them.
> > > >
> > > > OK, thanks, done for tomorrow. Though hopefully all this will be
> > > > resolved soon.
> > >
> > > I think that the best is for me to merge from the DRM branch that Linus
> > > picked, and solve the conflict there.
> > >
> > > This way, it should be a way easier for Linus to pick it, and not
> > > manually solve those conflicts with are not trivial.
> > >
> > > Laurent/Philipp,
> > >
> > > Please double-check if everything went fine on my conflict solving.
> > > I'm pushing it at branch "fixes" at the media development tree:
> > > git://linuxtv.org/media_tree.git fixes
> > >
> > > In any case, I double-checked that it is compiling and it is producing the
> > > media DocBook.
> > >
> > > PS.: I intend to send this latter today for being merged upstream.
> >
> > The numerical values are correct, but the order of the YUV formats got
> > messed
> > up. Could you squash the following change into the merge ?
>
> Sure. Squashed.
Thanks, this looks good to me.
One small thing, I noticed the MEDIA_BUS_FMT_VUY8_1X24 documentation has
the wrong value: It says 0x201a, but it should be 0x2024. This was
already wrong in the original patch: 2dca0551e4e2 ("[media] v4l: Add
VUY8 24 bits bus format").
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Em Tue, 21 Apr 2015 15:38:02 +0300 Laurent Pinchart escreveu: > Hi Mauro, > > On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote: > > Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: > > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote: > > > > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > > > > > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > > > > > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c > > > > > +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d > > > > > +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e > > > > > +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f > > > > > > > > The above 6 lines introduce duplicate defines, you can remove them. > > > > > > OK, thanks, done for tomorrow. Though hopefully all this will be > > > resolved soon. > > > > I think that the best is for me to merge from the DRM branch that Linus > > picked, and solve the conflict there. > > > > This way, it should be a way easier for Linus to pick it, and not > > manually solve those conflicts with are not trivial. > > > > Laurent/Philipp, > > > > Please double-check if everything went fine on my conflict solving. > > I'm pushing it at branch "fixes" at the media development tree: > > git://linuxtv.org/media_tree.git fixes > > > > In any case, I double-checked that it is compiling and it is producing the > > media DocBook. > > > > PS.: I intend to send this latter today for being merged upstream. > > The numerical values are correct, but the order of the YUV formats got messed > up. Could you squash the following change into the merge ? Sure. Squashed. Regards, Mauro > > diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml > b/Documentation/DocBook/media/v4l/subdev-formats.xml > index d66463b..2588ad7 100644 > --- a/Documentation/DocBook/media/v4l/subdev-formats.xml > +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml > @@ -3432,6 +3432,43 @@ see . > y1 > y0 > > + > + MEDIA_BUS_FMT_YUV8_1X24 > + 0x2025 > + > + - > + - > + - > + - > + - > + - > + - > + - > + y7 > + y6 > + y5 > + y4 > + y3 > + y2 > + y1 > + y0 > + u7 > + u6 > + u5 > + u4 > + u3 > + u2 > + u1 > + u0 > + v7 > + v6 > + v5 > + v4 > + v3 > + v2 > + v1 > + v0 > + > > MEDIA_BUS_FMT_UYVY12_1X24 > 0x2020 > @@ -3672,43 +3709,6 @@ see . > u1 > u0 > > - > - MEDIA_BUS_FMT_YUV8_1X24 > - 0x2025 > - > - - > - - > - - > - - > - - > - - > - - > - - > - y7 > - y6 > - y5 > - y4 > - y3 > - y2 > - y1 > - y0 > - u7 > - u6 > - u5 > - u4 > - u3 > - u2 > - u1 > - u0 > - v7 > - v6 > - v5 > - v4 > - v3 > - v2 > - v1 > - v0 > - > > MEDIA_BUS_FMT_YUV10_1X30 > 0x2016 > diff --git a/include/uapi/linux/media-bus-format.h > b/include/uapi/linux/media-bus-format.h > index 3eeb8cc..190d491 100644 > --- a/include/uapi/linux/media-bus-format.h > +++ b/include/uapi/linux/media-bus-format.h > @@ -75,6 +75,10 @@ > #define MEDIA_BUS_FMT_YUYV10_2X100x200b > #define MEDIA_BUS_FMT_YVYU10_2X100x200c > #define MEDIA_BUS_FMT_Y12_1X12 0x2013 > +#define MEDIA_BUS_FMT_UYVY12_2X120x201c > +#define MEDIA_BUS_FMT_VYUY12_2X120x201d > +#define MEDIA_BUS_FMT_YUYV12_2X120x201e > +#define MEDIA_BUS_FMT_YVYU12_2X120x201f > #define MEDIA_BUS_FMT_UYVY8_1X16 0x200f > #define MEDIA_BUS_FMT_VYUY8_1X16 0x2010 > #define MEDIA_BUS_FMT_YUYV8_1X16 0x2011 > @@ -86,16 +90,12 @@ > #define MEDIA_BUS_FMT_YVYU10_1X200x200e > #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 > #define MEDIA_BUS_FMT_YUV8_1X24 0x2025 > -#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > -#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > -#define MEDIA_BUS_FMT_UYVY12_2X120x201c > -#define MEDIA_BUS_FMT_VYUY12_2X120x201d > -#define MEDIA_BUS_FMT_YUYV12_2X120x201e > -#define MEDIA_BUS_FMT_YVYU12_2X120x201f > #define MEDIA_BUS_FMT_UYVY12_1X240x2020 > #define MEDIA_BUS_FMT_VYUY12_1X240x2021 > #define
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro, On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote: > Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote: > > > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > > > > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > > > > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c > > > > +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d > > > > +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e > > > > +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f > > > > > > The above 6 lines introduce duplicate defines, you can remove them. > > > > OK, thanks, done for tomorrow. Though hopefully all this will be > > resolved soon. > > I think that the best is for me to merge from the DRM branch that Linus > picked, and solve the conflict there. > > This way, it should be a way easier for Linus to pick it, and not > manually solve those conflicts with are not trivial. > > Laurent/Philipp, > > Please double-check if everything went fine on my conflict solving. > I'm pushing it at branch "fixes" at the media development tree: > git://linuxtv.org/media_tree.git fixes > > In any case, I double-checked that it is compiling and it is producing the > media DocBook. > > PS.: I intend to send this latter today for being merged upstream. The numerical values are correct, but the order of the YUV formats got messed up. Could you squash the following change into the merge ? diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml index d66463b..2588ad7 100644 --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml @@ -3432,6 +3432,43 @@ see . y1 y0 + + MEDIA_BUS_FMT_YUV8_1X24 + 0x2025 + + - + - + - + - + - + - + - + - + y7 + y6 + y5 + y4 + y3 + y2 + y1 + y0 + u7 + u6 + u5 + u4 + u3 + u2 + u1 + u0 + v7 + v6 + v5 + v4 + v3 + v2 + v1 + v0 + MEDIA_BUS_FMT_UYVY12_1X24 0x2020 @@ -3672,43 +3709,6 @@ see . u1 u0 - - MEDIA_BUS_FMT_YUV8_1X24 - 0x2025 - - - - - - - - - - - - - - - - - - y7 - y6 - y5 - y4 - y3 - y2 - y1 - y0 - u7 - u6 - u5 - u4 - u3 - u2 - u1 - u0 - v7 - v6 - v5 - v4 - v3 - v2 - v1 - v0 - MEDIA_BUS_FMT_YUV10_1X30 0x2016 diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h index 3eeb8cc..190d491 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -75,6 +75,10 @@ #define MEDIA_BUS_FMT_YUYV10_2X10 0x200b #define MEDIA_BUS_FMT_YVYU10_2X10 0x200c #define MEDIA_BUS_FMT_Y12_1X12 0x2013 +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f #define MEDIA_BUS_FMT_UYVY8_1X16 0x200f #define MEDIA_BUS_FMT_VYUY8_1X16 0x2010 #define MEDIA_BUS_FMT_YUYV8_1X16 0x2011 @@ -86,16 +90,12 @@ #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e #define MEDIA_BUS_FMT_VUY8_1X240x2024 #define MEDIA_BUS_FMT_YUV8_1X240x2025 -#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 -#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 -#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c -#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d -#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e -#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 #define MEDIA_BUS_FMT_YVYU12_1X24 0x2023 +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 /* Bayer
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: > Hi Laurent, > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart > wrote: > > > > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > > > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > > > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c > > > +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d > > > +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e > > > +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f > > > > The above 6 lines introduce duplicate defines, you can remove them. > > OK, thanks, done for tomorrow. Though hopefully all this will be > resolved soon. I think that the best is for me to merge from the DRM branch that Linus picked, and solve the conflict there. This way, it should be a way easier for Linus to pick it, and not manually solve those conflicts with are not trivial. Laurent/Philipp, Please double-check if everything went fine on my conflict solving. I'm pushing it at branch "fixes" at the media development tree: git://linuxtv.org/media_tree.git fixes In any case, I double-checked that it is compiling and it is producing the media DocBook. PS.: I intend to send this latter today for being merged upstream. Thanks, Mauro pgpxV4TNneIMI.pgp Description: Assinatura digital OpenPGP
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Laurent, On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote: > > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c > > +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d > > +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e > > +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f > > The above 6 lines introduce duplicate defines, you can remove them. OK, thanks, done for tomorrow. Though hopefully all this will be resolved soon. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp21AjfaDVD1.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Stephen, On Tuesday 21 April 2015 11:54:09 Stephen Rothwell wrote: > Hi Mauro, > > Today's linux-next merge of the v4l-dvb tree got a conflict in > include/uapi/linux/media-bus-format.h between various commits from > Linus' tree and various commits from the v4l-dvb tree. > > I reported this previously against the drm tree but some fo the numbers > have changed. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > > -- > Cheers, > Stephen Rothwells...@canb.auug.org.au > > diff --cc include/uapi/linux/media-bus-format.h > index 73c78f18a328,d391893064a0.. > --- a/include/uapi/linux/media-bus-format.h > +++ b/include/uapi/linux/media-bus-format.h > @@@ -45,18 -43,14 +45,20 @@@ > #define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007 > #define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008 > #define MEDIA_BUS_FMT_RGB666_1X18 0x1009 > +#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI 0x1015 > +#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG 0x1010 > +#define MEDIA_BUS_FMT_BGR888_1X24 0x1013 > +#define MEDIA_BUS_FMT_GBR888_1X24 0x1014 > + #define MEDIA_BUS_FMT_RBG888_1X24 0x100e > #define MEDIA_BUS_FMT_RGB888_1X24 0x100a > #define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b > #define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c > +#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG 0x1011 > +#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 > #define MEDIA_BUS_FMT_ARGB_1X32 0x100d > + #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f > > -/* YUV (including grey) - next is 0x2025 */ > +/* YUV (including grey) - next is 0x2026 */ > #define MEDIA_BUS_FMT_Y8_1X8 0x2001 > #define MEDIA_BUS_FMT_UV8_1X8 0x2015 > #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 > @@@ -82,13 -80,7 +88,14 @@@ > #define MEDIA_BUS_FMT_VYUY10_1X20 0x201b > #define MEDIA_BUS_FMT_YUYV10_1X20 0x200d > #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e > +#define MEDIA_BUS_FMT_YUV8_1X24 0x2025 The above line is correct. > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c > +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d > +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e > +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f The above 6 lines introduce duplicate defines, you can remove them. > + #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 > #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 > #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 > #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Laurent, On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart laurent.pinch...@ideasonboard.com wrote: +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f The above 6 lines introduce duplicate defines, you can remove them. OK, thanks, done for tomorrow. Though hopefully all this will be resolved soon. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp21AjfaDVD1.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Em Tue, 21 Apr 2015 15:38:02 +0300 Laurent Pinchart laurent.pinch...@ideasonboard.com escreveu: Hi Mauro, On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote: Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote: +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f The above 6 lines introduce duplicate defines, you can remove them. OK, thanks, done for tomorrow. Though hopefully all this will be resolved soon. I think that the best is for me to merge from the DRM branch that Linus picked, and solve the conflict there. This way, it should be a way easier for Linus to pick it, and not manually solve those conflicts with are not trivial. Laurent/Philipp, Please double-check if everything went fine on my conflict solving. I'm pushing it at branch fixes at the media development tree: git://linuxtv.org/media_tree.git fixes In any case, I double-checked that it is compiling and it is producing the media DocBook. PS.: I intend to send this latter today for being merged upstream. The numerical values are correct, but the order of the YUV formats got messed up. Could you squash the following change into the merge ? Sure. Squashed. Regards, Mauro diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml index d66463b..2588ad7 100644 --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml @@ -3432,6 +3432,43 @@ see xref linkend=colorspaces /./entry entryysubscript1/subscript/entry entryysubscript0/subscript/entry /row + row id=MEDIA-BUS-FMT-YUV8-1X24 + entryMEDIA_BUS_FMT_YUV8_1X24/entry + entry0x2025/entry + entry/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entryysubscript7/subscript/entry + entryysubscript6/subscript/entry + entryysubscript5/subscript/entry + entryysubscript4/subscript/entry + entryysubscript3/subscript/entry + entryysubscript2/subscript/entry + entryysubscript1/subscript/entry + entryysubscript0/subscript/entry + entryusubscript7/subscript/entry + entryusubscript6/subscript/entry + entryusubscript5/subscript/entry + entryusubscript4/subscript/entry + entryusubscript3/subscript/entry + entryusubscript2/subscript/entry + entryusubscript1/subscript/entry + entryusubscript0/subscript/entry + entryvsubscript7/subscript/entry + entryvsubscript6/subscript/entry + entryvsubscript5/subscript/entry + entryvsubscript4/subscript/entry + entryvsubscript3/subscript/entry + entryvsubscript2/subscript/entry + entryvsubscript1/subscript/entry + entryvsubscript0/subscript/entry + /row row id=MEDIA-BUS-FMT-UYVY12-1X24 entryMEDIA_BUS_FMT_UYVY12_1X24/entry entry0x2020/entry @@ -3672,43 +3709,6 @@ see xref linkend=colorspaces /./entry entryusubscript1/subscript/entry entryusubscript0/subscript/entry /row - row id=MEDIA-BUS-FMT-YUV8-1X24 - entryMEDIA_BUS_FMT_YUV8_1X24/entry - entry0x2025/entry - entry/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entryysubscript7/subscript/entry - entryysubscript6/subscript/entry - entryysubscript5/subscript/entry - entryysubscript4/subscript/entry - entryysubscript3/subscript/entry - entryysubscript2/subscript/entry - entryysubscript1/subscript/entry - entryysubscript0/subscript/entry - entryusubscript7/subscript/entry - entryusubscript6/subscript/entry - entryusubscript5/subscript/entry - entryusubscript4/subscript/entry - entryusubscript3/subscript/entry - entryusubscript2/subscript/entry - entryusubscript1/subscript/entry - entryusubscript0/subscript/entry - entryvsubscript7/subscript/entry -
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Stephen, On Tuesday 21 April 2015 11:54:09 Stephen Rothwell wrote: Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in include/uapi/linux/media-bus-format.h between various commits from Linus' tree and various commits from the v4l-dvb tree. I reported this previously against the drm tree but some fo the numbers have changed. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc include/uapi/linux/media-bus-format.h index 73c78f18a328,d391893064a0.. --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@@ -45,18 -43,14 +45,20 @@@ #define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007 #define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008 #define MEDIA_BUS_FMT_RGB666_1X18 0x1009 +#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI 0x1015 +#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG 0x1010 +#define MEDIA_BUS_FMT_BGR888_1X24 0x1013 +#define MEDIA_BUS_FMT_GBR888_1X24 0x1014 + #define MEDIA_BUS_FMT_RBG888_1X24 0x100e #define MEDIA_BUS_FMT_RGB888_1X24 0x100a #define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b #define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c +#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG 0x1011 +#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 #define MEDIA_BUS_FMT_ARGB_1X32 0x100d + #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f -/* YUV (including grey) - next is 0x2025 */ +/* YUV (including grey) - next is 0x2026 */ #define MEDIA_BUS_FMT_Y8_1X8 0x2001 #define MEDIA_BUS_FMT_UV8_1X8 0x2015 #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 @@@ -82,13 -80,7 +88,14 @@@ #define MEDIA_BUS_FMT_VYUY10_1X20 0x201b #define MEDIA_BUS_FMT_YUYV10_1X20 0x200d #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e +#define MEDIA_BUS_FMT_YUV8_1X24 0x2025 The above line is correct. +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f The above 6 lines introduce duplicate defines, you can remove them. + #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Am Dienstag, den 21.04.2015, 10:12 -0300 schrieb Mauro Carvalho Chehab: Em Tue, 21 Apr 2015 15:38:02 +0300 Laurent Pinchart laurent.pinch...@ideasonboard.com escreveu: Hi Mauro, On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote: Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote: +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f The above 6 lines introduce duplicate defines, you can remove them. OK, thanks, done for tomorrow. Though hopefully all this will be resolved soon. I think that the best is for me to merge from the DRM branch that Linus picked, and solve the conflict there. This way, it should be a way easier for Linus to pick it, and not manually solve those conflicts with are not trivial. Laurent/Philipp, Please double-check if everything went fine on my conflict solving. I'm pushing it at branch fixes at the media development tree: git://linuxtv.org/media_tree.git fixes In any case, I double-checked that it is compiling and it is producing the media DocBook. PS.: I intend to send this latter today for being merged upstream. The numerical values are correct, but the order of the YUV formats got messed up. Could you squash the following change into the merge ? Sure. Squashed. Thanks, this looks good to me. One small thing, I noticed the MEDIA_BUS_FMT_VUY8_1X24 documentation has the wrong value: It says 0x201a, but it should be 0x2024. This was already wrong in the original patch: 2dca0551e4e2 ([media] v4l: Add VUY8 24 bits bus format). regards Philipp -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell s...@canb.auug.org.au escreveu: Hi Laurent, On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart laurent.pinch...@ideasonboard.com wrote: +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f The above 6 lines introduce duplicate defines, you can remove them. OK, thanks, done for tomorrow. Though hopefully all this will be resolved soon. I think that the best is for me to merge from the DRM branch that Linus picked, and solve the conflict there. This way, it should be a way easier for Linus to pick it, and not manually solve those conflicts with are not trivial. Laurent/Philipp, Please double-check if everything went fine on my conflict solving. I'm pushing it at branch fixes at the media development tree: git://linuxtv.org/media_tree.git fixes In any case, I double-checked that it is compiling and it is producing the media DocBook. PS.: I intend to send this latter today for being merged upstream. Thanks, Mauro pgpxV4TNneIMI.pgp Description: Assinatura digital OpenPGP
Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro, On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote: Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote: +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f The above 6 lines introduce duplicate defines, you can remove them. OK, thanks, done for tomorrow. Though hopefully all this will be resolved soon. I think that the best is for me to merge from the DRM branch that Linus picked, and solve the conflict there. This way, it should be a way easier for Linus to pick it, and not manually solve those conflicts with are not trivial. Laurent/Philipp, Please double-check if everything went fine on my conflict solving. I'm pushing it at branch fixes at the media development tree: git://linuxtv.org/media_tree.git fixes In any case, I double-checked that it is compiling and it is producing the media DocBook. PS.: I intend to send this latter today for being merged upstream. The numerical values are correct, but the order of the YUV formats got messed up. Could you squash the following change into the merge ? diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml index d66463b..2588ad7 100644 --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml @@ -3432,6 +3432,43 @@ see xref linkend=colorspaces /./entry entryysubscript1/subscript/entry entryysubscript0/subscript/entry /row + row id=MEDIA-BUS-FMT-YUV8-1X24 + entryMEDIA_BUS_FMT_YUV8_1X24/entry + entry0x2025/entry + entry/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entry-/entry + entryysubscript7/subscript/entry + entryysubscript6/subscript/entry + entryysubscript5/subscript/entry + entryysubscript4/subscript/entry + entryysubscript3/subscript/entry + entryysubscript2/subscript/entry + entryysubscript1/subscript/entry + entryysubscript0/subscript/entry + entryusubscript7/subscript/entry + entryusubscript6/subscript/entry + entryusubscript5/subscript/entry + entryusubscript4/subscript/entry + entryusubscript3/subscript/entry + entryusubscript2/subscript/entry + entryusubscript1/subscript/entry + entryusubscript0/subscript/entry + entryvsubscript7/subscript/entry + entryvsubscript6/subscript/entry + entryvsubscript5/subscript/entry + entryvsubscript4/subscript/entry + entryvsubscript3/subscript/entry + entryvsubscript2/subscript/entry + entryvsubscript1/subscript/entry + entryvsubscript0/subscript/entry + /row row id=MEDIA-BUS-FMT-UYVY12-1X24 entryMEDIA_BUS_FMT_UYVY12_1X24/entry entry0x2020/entry @@ -3672,43 +3709,6 @@ see xref linkend=colorspaces /./entry entryusubscript1/subscript/entry entryusubscript0/subscript/entry /row - row id=MEDIA-BUS-FMT-YUV8-1X24 - entryMEDIA_BUS_FMT_YUV8_1X24/entry - entry0x2025/entry - entry/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entry-/entry - entryysubscript7/subscript/entry - entryysubscript6/subscript/entry - entryysubscript5/subscript/entry - entryysubscript4/subscript/entry - entryysubscript3/subscript/entry - entryysubscript2/subscript/entry - entryysubscript1/subscript/entry - entryysubscript0/subscript/entry - entryusubscript7/subscript/entry - entryusubscript6/subscript/entry - entryusubscript5/subscript/entry - entryusubscript4/subscript/entry - entryusubscript3/subscript/entry - entryusubscript2/subscript/entry - entryusubscript1/subscript/entry - entryusubscript0/subscript/entry - entryvsubscript7/subscript/entry - entryvsubscript6/subscript/entry - entryvsubscript5/subscript/entry -
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in include/uapi/linux/media-bus-format.h between various commits from Linus' tree and various commits from the v4l-dvb tree. I reported this previously against the drm tree but some fo the numbers have changed. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc include/uapi/linux/media-bus-format.h index 73c78f18a328,d391893064a0.. --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@@ -45,18 -43,14 +45,20 @@@ #define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007 #define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008 #define MEDIA_BUS_FMT_RGB666_1X18 0x1009 +#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI 0x1015 +#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG 0x1010 +#define MEDIA_BUS_FMT_BGR888_1X24 0x1013 +#define MEDIA_BUS_FMT_GBR888_1X24 0x1014 + #define MEDIA_BUS_FMT_RBG888_1X24 0x100e #define MEDIA_BUS_FMT_RGB888_1X24 0x100a #define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b #define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c +#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG 0x1011 +#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 #define MEDIA_BUS_FMT_ARGB_1X32 0x100d + #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f -/* YUV (including grey) - next is 0x2025 */ +/* YUV (including grey) - next is 0x2026 */ #define MEDIA_BUS_FMT_Y8_1X8 0x2001 #define MEDIA_BUS_FMT_UV8_1X8 0x2015 #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 @@@ -82,13 -80,7 +88,14 @@@ #define MEDIA_BUS_FMT_VYUY10_1X20 0x201b #define MEDIA_BUS_FMT_YUYV10_1X20 0x200d #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e +#define MEDIA_BUS_FMT_YUV8_1X24 0x2025 +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f + #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 pgp1uJBOVPnOi.pgp Description: OpenPGP digital signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in Documentation/DocBook/media/v4l/subdev-formats.xml between various commits from Linus' tree and various commits from the v4l-dvb tree. I reported this previously against the drm tree, but some of the numbers have changed now. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc Documentation/DocBook/media/v4l/subdev-formats.xml index 553a38024745,bc8d3fb9e4a9.. --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml @@@ -482,96 -440,36 +482,126 @@@ see .b1 b0 + +MEDIA_BUS_FMT_RGB666_1X24_CPADHI +0x1015 + + +0 +0 +r5 +r4 +r3 +r2 +r1 +r0 +0 +0 +g5 +g4 +g3 +g2 +g1 +g0 +0 +0 +b5 +b4 +b3 +b2 +b1 +b0 + + +MEDIA_BUS_FMT_BGR888_1X24 +0x1013 + + +b7 +b6 +b5 +b4 +b3 +b2 +b1 +b0 +g7 +g6 +g5 +g4 +g3 +g2 +g1 +g0 +r7 +r6 +r5 +r4 +r3 +r2 +r1 +r0 + + +MEDIA_BUS_FMT_GBR888_1X24 +0x1014 + + +g7 +g6 +g5 +g4 +g3 +g2 +g1 +g0 +b7 +b6 +b5 +b4 +b3 +b2 +b1 +b0 +r7 +r6 +r5 +r4 +r3 +r2 +r1 +r0 + + + MEDIA_BUS_FMT_RBG888_1X24 + 0x100e + + + r7 + r6 + r5 + r4 + r3 + r2 + r1 + r0 + b7 + b6 + b5 + b4 + b3 + b2 + b1 + b0 + g7 + g6 + g5 + g4 + g3 + g2 + g1 + g0 + MEDIA_BUS_FMT_RGB888_1X24 0x100a @@@ -3047,92 -2719,33 +3106,92 @@@ u1 u0 + +MEDIA_BUS_FMT_YUV8_1X24 +0x2025 + +- +- +- +- +- +- +- +- +y7 +y6 +y5 +y4 +y3 +y2 +y1 +y0 +u7 +u6 +u5 +u4 +u3 +u2 +u1 +u0 +v7 +v6 +v5 +v4 +v3 +v2 +v1 +v0 + + +MEDIA_BUS_FMT_YUV10_1X30 +0x2016 + - - - - - y9 - y8 ++ +y7 +y6 +y5 +y4 +y3 +y2 +y1 +y0 - u9 - u8 - u7 - u6 - u5 - u4 - u3 - u2 - u1 - u0 - v9 - v8 - v7 - v6 - v5 - v4 - v3 - v2 - v1 - v0 ++d ++d ++d ++d ++d ++d ++d ++d + - - MEDIA_BUS_FMT_AYUV8_1X32 - 0x2017 + + MEDIA_BUS_FMT_YDYUYDYV8_1X16 + 0x2014 - a7 - a6 - a5 - a4 - a3 - a2 - a1 - a0 + + y7 + y6 + y5 + y4 + y3 + y2 + y1 + y0 + d + d + d + d + d + d + d +
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in include/uapi/linux/media-bus-format.h between various commits from Linus' tree and various commits from the v4l-dvb tree. I reported this previously against the drm tree but some fo the numbers have changed. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc include/uapi/linux/media-bus-format.h index 73c78f18a328,d391893064a0.. --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@@ -45,18 -43,14 +45,20 @@@ #define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007 #define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008 #define MEDIA_BUS_FMT_RGB666_1X18 0x1009 +#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI 0x1015 +#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG 0x1010 +#define MEDIA_BUS_FMT_BGR888_1X24 0x1013 +#define MEDIA_BUS_FMT_GBR888_1X24 0x1014 + #define MEDIA_BUS_FMT_RBG888_1X24 0x100e #define MEDIA_BUS_FMT_RGB888_1X24 0x100a #define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b #define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c +#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG 0x1011 +#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 #define MEDIA_BUS_FMT_ARGB_1X32 0x100d + #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f -/* YUV (including grey) - next is 0x2025 */ +/* YUV (including grey) - next is 0x2026 */ #define MEDIA_BUS_FMT_Y8_1X8 0x2001 #define MEDIA_BUS_FMT_UV8_1X8 0x2015 #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 @@@ -82,13 -80,7 +88,14 @@@ #define MEDIA_BUS_FMT_VYUY10_1X20 0x201b #define MEDIA_BUS_FMT_YUYV10_1X20 0x200d #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e +#define MEDIA_BUS_FMT_YUV8_1X24 0x2025 +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c +#define MEDIA_BUS_FMT_VYUY12_2X12 0x201d +#define MEDIA_BUS_FMT_YUYV12_2X12 0x201e +#define MEDIA_BUS_FMT_YVYU12_2X12 0x201f + #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 pgp1uJBOVPnOi.pgp Description: OpenPGP digital signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in Documentation/DocBook/media/v4l/subdev-formats.xml between various commits from Linus' tree and various commits from the v4l-dvb tree. I reported this previously against the drm tree, but some of the numbers have changed now. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc Documentation/DocBook/media/v4l/subdev-formats.xml index 553a38024745,bc8d3fb9e4a9.. --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml @@@ -482,96 -440,36 +482,126 @@@ see xref linkend=colorspaces /./en entrybsubscript1/subscript/entry entrybsubscript0/subscript/entry /row + row id=MEDIA-BUS-FMT-RGB666-1X24_CPADHI +entryMEDIA_BUS_FMT_RGB666_1X24_CPADHI/entry +entry0x1015/entry +entry/entry +dash-ent-8; +entry0/entry +entry0/entry +entryrsubscript5/subscript/entry +entryrsubscript4/subscript/entry +entryrsubscript3/subscript/entry +entryrsubscript2/subscript/entry +entryrsubscript1/subscript/entry +entryrsubscript0/subscript/entry +entry0/entry +entry0/entry +entrygsubscript5/subscript/entry +entrygsubscript4/subscript/entry +entrygsubscript3/subscript/entry +entrygsubscript2/subscript/entry +entrygsubscript1/subscript/entry +entrygsubscript0/subscript/entry +entry0/entry +entry0/entry +entrybsubscript5/subscript/entry +entrybsubscript4/subscript/entry +entrybsubscript3/subscript/entry +entrybsubscript2/subscript/entry +entrybsubscript1/subscript/entry +entrybsubscript0/subscript/entry + /row + row id=MEDIA-BUS-FMT-BGR888-1X24 +entryMEDIA_BUS_FMT_BGR888_1X24/entry +entry0x1013/entry +entry/entry +dash-ent-8; +entrybsubscript7/subscript/entry +entrybsubscript6/subscript/entry +entrybsubscript5/subscript/entry +entrybsubscript4/subscript/entry +entrybsubscript3/subscript/entry +entrybsubscript2/subscript/entry +entrybsubscript1/subscript/entry +entrybsubscript0/subscript/entry +entrygsubscript7/subscript/entry +entrygsubscript6/subscript/entry +entrygsubscript5/subscript/entry +entrygsubscript4/subscript/entry +entrygsubscript3/subscript/entry +entrygsubscript2/subscript/entry +entrygsubscript1/subscript/entry +entrygsubscript0/subscript/entry +entryrsubscript7/subscript/entry +entryrsubscript6/subscript/entry +entryrsubscript5/subscript/entry +entryrsubscript4/subscript/entry +entryrsubscript3/subscript/entry +entryrsubscript2/subscript/entry +entryrsubscript1/subscript/entry +entryrsubscript0/subscript/entry + /row + row id=MEDIA-BUS-FMT-GBR888-1X24 +entryMEDIA_BUS_FMT_GBR888_1X24/entry +entry0x1014/entry +entry/entry +dash-ent-8; +entrygsubscript7/subscript/entry +entrygsubscript6/subscript/entry +entrygsubscript5/subscript/entry +entrygsubscript4/subscript/entry +entrygsubscript3/subscript/entry +entrygsubscript2/subscript/entry +entrygsubscript1/subscript/entry +entrygsubscript0/subscript/entry +entrybsubscript7/subscript/entry +entrybsubscript6/subscript/entry +entrybsubscript5/subscript/entry +entrybsubscript4/subscript/entry +entrybsubscript3/subscript/entry +entrybsubscript2/subscript/entry +entrybsubscript1/subscript/entry +entrybsubscript0/subscript/entry +entryrsubscript7/subscript/entry +entryrsubscript6/subscript/entry +entryrsubscript5/subscript/entry +entryrsubscript4/subscript/entry +entryrsubscript3/subscript/entry +entryrsubscript2/subscript/entry +entryrsubscript1/subscript/entry +entryrsubscript0/subscript/entry + /row + row id=MEDIA-BUS-FMT-RBG888-1X24 + entryMEDIA_BUS_FMT_RBG888_1X24/entry + entry0x100e/entry + entry/entry + dash-ent-8; + entryrsubscript7/subscript/entry +
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/staging/media/go7007/go7007-usb.c between commits 66a528c1c3d6
("Revert "staging:media: Use dev_dbg() instead of pr_debug()"") and
e6bbda9da9e8 ("Staging: go7007: fix up some remaining go->dev issues")
from Linus' tree and commit c61c3094a630 ("[media] go7007-usb: only use
go->dev after allocated") from the v4l-dvb tree.
I fixed it up (I basically used the version from the patches in Linus'
tree (they are in v3.13-rc2) - see below) and can carry the fix as necessary
(no action is
required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/staging/media/go7007/go7007-usb.c
index b658c2316df3,1d747de6dfa6..
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@@ -1099,13 -1097,16 +1099,15 @@@ static int go7007_usb_probe(struct usb_
board = _px_tv402u;
break;
case GO7007_BOARDID_LIFEVIEW_LR192:
- printk(KERN_ERR
- "The Lifeview TV Walker Ultra is not supported.
Sorry!\n");
+ dev_err(>dev, "The Lifeview TV Walker Ultra is not
supported. Sorry!\n");
return -ENODEV;
+ #if 0
name = "Lifeview TV Walker Ultra";
board = _lifeview_lr192;
break;
+ #endif
case GO7007_BOARDID_SENSORAY_2250:
- printk(KERN_INFO "Sensoray 2250 found\n");
+ dev_info(>dev, "Sensoray 2250 found\n");
name = "Sensoray 2250/2251";
board = _sensoray_2250;
break;
pgpcP_UKH8kRq.pgp
Description: PGP signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in drivers/staging/media/go7007/go7007-usb.c between commits 66a528c1c3d6 (Revert staging:media: Use dev_dbg() instead of pr_debug()) and e6bbda9da9e8 (Staging: go7007: fix up some remaining go-dev issues) from Linus' tree and commit c61c3094a630 ([media] go7007-usb: only use go-dev after allocated) from the v4l-dvb tree. I fixed it up (I basically used the version from the patches in Linus' tree (they are in v3.13-rc2) - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/staging/media/go7007/go7007-usb.c index b658c2316df3,1d747de6dfa6.. --- a/drivers/staging/media/go7007/go7007-usb.c +++ b/drivers/staging/media/go7007/go7007-usb.c @@@ -1099,13 -1097,16 +1099,15 @@@ static int go7007_usb_probe(struct usb_ board = board_px_tv402u; break; case GO7007_BOARDID_LIFEVIEW_LR192: - printk(KERN_ERR - The Lifeview TV Walker Ultra is not supported. Sorry!\n); + dev_err(intf-dev, The Lifeview TV Walker Ultra is not supported. Sorry!\n); return -ENODEV; + #if 0 name = Lifeview TV Walker Ultra; board = board_lifeview_lr192; break; + #endif case GO7007_BOARDID_SENSORAY_2250: - printk(KERN_INFO Sensoray 2250 found\n); + dev_info(intf-dev, Sensoray 2250 found\n); name = Sensoray 2250/2251; board = board_sensoray_2250; break; pgpcP_UKH8kRq.pgp Description: PGP signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-shmobile/board-bockw.c between commit fa3e0cee12fb ("ARM:
shmobile: BOCK-W: fix SDHI0 PFC settings") from Linus' tree and commit
9c43952d0f1e ("[media] ARM: shmobile: BOCK-W: add VIN and ML86V7667
support") from the v4l-dvb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-shmobile/board-bockw.c
index 3354a85,7d44f66..000
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@@ -167,13 -188,17 +188,23 @@@ static const struct pinctrl_map bockw_p
"usb1", "usb1"),
/* SDHI0 */
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
-"sdhi0", "sdhi0"),
+"sdhi0_data4", "sdhi0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
+"sdhi0_ctrl", "sdhi0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
+"sdhi0_cd", "sdhi0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
+"sdhi0_wp", "sdhi0"),
+ /* VIN0 */
+ PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+ "vin0_clk", "vin0"),
+ PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+ "vin0_data8", "vin0"),
+ /* VIN1 */
+ PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+ "vin1_clk", "vin1"),
+ PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+ "vin1_data8", "vin1"),
};
#define FPGA 0x1820
pgpiaaWvmZztU.pgp
Description: PGP signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in arch/arm/mach-shmobile/board-bockw.c between commit fa3e0cee12fb (ARM: shmobile: BOCK-W: fix SDHI0 PFC settings) from Linus' tree and commit 9c43952d0f1e ([media] ARM: shmobile: BOCK-W: add VIN and ML86V7667 support) from the v4l-dvb tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/mach-shmobile/board-bockw.c index 3354a85,7d44f66..000 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@@ -167,13 -188,17 +188,23 @@@ static const struct pinctrl_map bockw_p usb1, usb1), /* SDHI0 */ PIN_MAP_MUX_GROUP_DEFAULT(sh_mobile_sdhi.0, pfc-r8a7778, -sdhi0, sdhi0), +sdhi0_data4, sdhi0), + PIN_MAP_MUX_GROUP_DEFAULT(sh_mobile_sdhi.0, pfc-r8a7778, +sdhi0_ctrl, sdhi0), + PIN_MAP_MUX_GROUP_DEFAULT(sh_mobile_sdhi.0, pfc-r8a7778, +sdhi0_cd, sdhi0), + PIN_MAP_MUX_GROUP_DEFAULT(sh_mobile_sdhi.0, pfc-r8a7778, +sdhi0_wp, sdhi0), + /* VIN0 */ + PIN_MAP_MUX_GROUP_DEFAULT(r8a7778-vin.0, pfc-r8a7778, + vin0_clk, vin0), + PIN_MAP_MUX_GROUP_DEFAULT(r8a7778-vin.0, pfc-r8a7778, + vin0_data8, vin0), + /* VIN1 */ + PIN_MAP_MUX_GROUP_DEFAULT(r8a7778-vin.1, pfc-r8a7778, + vin1_clk, vin1), + PIN_MAP_MUX_GROUP_DEFAULT(r8a7778-vin.1, pfc-r8a7778, + vin1_data8, vin1), }; #define FPGA 0x1820 pgpiaaWvmZztU.pgp Description: PGP signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
Documentation/feature-removal-schedule.txt between commit 9c0ece069b32
("Get rid of Documentation/feature-removal.txt") from Linus' tree and
commit 251658e5185e ("[media] Schedule removal of i.MX25 support in
mx2_camera.c") from the v4l-dvb tree.
I just removed the file and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpvifXZFAj9w.pgp
Description: PGP signature
linux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in Documentation/feature-removal-schedule.txt between commit 9c0ece069b32 (Get rid of Documentation/feature-removal.txt) from Linus' tree and commit 251658e5185e ([media] Schedule removal of i.MX25 support in mx2_camera.c) from the v4l-dvb tree. I just removed the file and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpvifXZFAj9w.pgp Description: PGP signature
