[PATCH V2] V4L/DVB: v4l: Add driver for Marvell PXA910 CCIC

2011-05-31 Thread Kassey Lee
This driver exports a video device node per each CCIC (CMOS Camera Interface Controller) device contained in Marvell Mobile PXA910 SoC The driver is based on soc-camera + videobuf2 frame work, and only USERPTR is supported. Signed-off-by: Kassey Lee --- arch/arm/mach-mmp/include/mach/camera.h |

Re: [PATCH] V4L/DVB: v4l: Add driver for Marvell PXA910 CCIC

2011-05-31 Thread Kassey Lee
Guennadi: thanks for your detail review and comments. I updated one by one, and will send out the patch later. thanks 2011/5/31 Guennadi Liakhovetski : > On Fri, 27 May 2011, Kassey Lee wrote: > >> This driver exports a video device node per each CCIC >> (CMOS Camera Interface Contro

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Chris Rodley
Hi Javier, On 01/06/11 01:34, Koen Kooi wrote: > root@beagleboardxMC:~# yavta -f SGRBG8 -s 320x240 -n 4 --capture=10 --skip 3 > -F `media-ctl -e "OMAP3 ISP CCDC output"` > Device /dev/video2 opened. > Device `OMAP3 ISP CCDC output' on `media' is a video capture device. > Video format set: SGRBG8

RE: [PATCH 5/5 v2] [media] ov9740: Add suspend/resume

2011-05-31 Thread Andrew Chew
> > + /* For suspend/resume. */ > > + struct v4l2_mbus_framefmt current_mf; > > + int current_enable; > > bool? Are you sure you want this to be a bool? This thing is trying to shadow the "enable" parameter of the s_stream() callback, and that enable para

RE: [PATCH 4/5 v2] [media] ov9740: Remove hardcoded resolution regs

2011-05-31 Thread Andrew Chew
> > + /* Width must be a multiple of 4 pixels. */ > > + *width += *width % 4; > > No, this doesn't make it a multiple of 4, unless it was > even;) Just take 5 > as an example. What you really want here is Geez, you're right. Not sure what was going on in my head when I did this. Thanks f

RE: [PATCH 3/5 v2] [media] ov9740: Fixed some settings

2011-05-31 Thread Andrew Chew
> > + { OV9740_MIPI_CTRL00, 0x64 }, /* 0x44 for > continuous clock */ > > I think, the choice between continuous and discontinuous CSI-2 clock > should become configurable. You can only use discontinuous clock with > hosts, that support it, right? Whereas all hosts must support > c

[PATCH] [media] uvcvideo: Fix control mapping for devices with multiple chains

2011-05-31 Thread Stephan Lachowsky
The search for matching extension units fails to take account of the current chain. In the case where you have two distinct video chains, both containing an XU with the same GUID but different unit ids, you will be unable to perform a mapping on the second chain because entity on the first chain w

[PATCH] V4L/DVB: radio-si470x: fix memory leak in si470x_usb_driver_probe()

2011-05-31 Thread Alexey Khoroshilov
radio->int_in_urb is not deallocated on error paths in si470x_usb_driver_probe(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov --- drivers/media/radio/si470x/radio-si470x-usb.c |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) di

[cron job] v4l-dvb daily build: ERRORS

2011-05-31 Thread Hans Verkuil
This message is generated daily by a cron job that builds v4l-dvb for the kernels and architectures in the list below. Results of the daily build of v4l-dvb: date:Tue May 31 19:00:33 CEST 2011 git hash:f9b51477fe540fb4c65a05027fdd6f2ecce4db3b gcc version: i686-linux-gcc (GCC) 4.5

RE: [PATCH] V4L2: omap_vout: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread Hiremath, Vaibhav
> -Original Message- > From: JAIN, AMBER > Sent: Tuesday, May 31, 2011 8:16 PM > To: linux-media@vger.kernel.org > Cc: Hiremath, Vaibhav; sakari.ai...@iki.fi; JAIN, AMBER > Subject: [PATCH] V4L2: omap_vout: Remove GFP_DMA allocation as ZONE_DMA is > not configured on OMAP > > Remove GFP_D

RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread Hiremath, Vaibhav
> -Original Message- > From: Guennadi Liakhovetski [mailto:g.liakhovet...@gmx.de] > Sent: Tuesday, May 31, 2011 10:40 PM > To: JAIN, AMBER > Cc: linux-media@vger.kernel.org; Hiremath, Vaibhav; sakari.ai...@iki.fi > Subject: Re: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is >

Re: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread Guennadi Liakhovetski
On Tue, 31 May 2011, Amber Jain wrote: > Remove GFP_DMA from the __get_free_pages() call as ZONE_DMA is not configured > on OMAP. Earlier the page allocator used to return a page from ZONE_NORMAL > even when GFP_DMA is passed and CONFIG_ZONE_DMA is disabled. > As a result of commit a197b59ae6e8bee

Re: About RFC of HDMI-CEC

2011-05-31 Thread Hans Verkuil
On Thursday, May 26, 2011 14:16:58 vipul kumar samar wrote: > On 05/26/2011 12:05 PM, Hans Verkuil wrote: > > On Thursday, May 26, 2011 07:09:30 vipul kumar samar wrote: > >> Hello, > >> > >> On 05/25/2011 06:13 PM, Martin Bugge (marbugge) wrote: > >>> Hello > >>> > >>> To be honest I became a bit

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Koen Kooi
Op 31 mei 2011, om 16:09 heeft Guennadi Liakhovetski het volgende geschreven: > On Tue, 31 May 2011, Koen Kooi wrote: > >> >> Op 31 mei 2011, om 15:42 heeft javier Martin het volgende geschreven: >> >>> On 31 May 2011 15:34, Koen Kooi wrote: root@beagleboardxMC:~# yavta -f SGRBG8 -s 320x

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Koen Kooi
Op 31 mei 2011, om 16:46 heeft Laurent Pinchart het volgende geschreven: > On Tuesday 31 May 2011 15:55:04 Guennadi Liakhovetski wrote: >> On Tue, 31 May 2011, Koen Kooi wrote: >>> Op 31 mei 2011, om 11:46 heeft Javier Martin het volgende geschreven: diff --git a/arch/arm/mach-omap2/board-om

Re: omap3isp - H3A auto white balance

2011-05-31 Thread Laurent Pinchart
Hi Daniel, On Tuesday 31 May 2011 12:07:08 Daniel Lundborg wrote: [snip] > > Any chance you will submit the driver for inclusion in the kernel ? > > Yes if there is an interest in it. I can create a patch from your > omap3isp-next-sensors tree if you want. That would be nice, thank you. -- R

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Guennadi Liakhovetski
On Tue, 31 May 2011, Laurent Pinchart wrote: > On Tuesday 31 May 2011 15:55:04 Guennadi Liakhovetski wrote: > > On Tue, 31 May 2011, Koen Kooi wrote: > > > Op 31 mei 2011, om 11:46 heeft Javier Martin het volgende geschreven: > > > > diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c > >

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Laurent Pinchart
On Tuesday 31 May 2011 15:55:04 Guennadi Liakhovetski wrote: > On Tue, 31 May 2011, Koen Kooi wrote: > > Op 31 mei 2011, om 11:46 heeft Javier Martin het volgende geschreven: > > > diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c > > > b/arch/arm/mach-omap2/board-omap3beagle-camera.c new

[PATCH] OMAP2: V4L2: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread Amber Jain
Remove GFP_DMA from the __get_free_pages() call from omap24xxcam as ZONE_DMA is not configured on OMAP. Earlier the page allocator used to return a page from ZONE_NORMAL even when GFP_DMA is passed and CONFIG_ZONE_DMA is disabled. As a result of commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac, page

[PATCH] V4L2: omap_vout: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread Amber Jain
Remove GFP_DMA from the __get_free_pages() call from omap_vout as ZONE_DMA is not configured on OMAP. Earlier the page allocator used to return a page from ZONE_NORMAL even when GFP_DMA is passed and CONFIG_ZONE_DMA is disabled. As a result of commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac, page

RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread Hiremath, Vaibhav
> -Original Message- > From: JAIN, AMBER > Sent: Tuesday, May 31, 2011 7:53 PM > To: Hiremath, Vaibhav; linux-media@vger.kernel.org > Cc: sakari.ai...@iki.fi > Subject: RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is > not configured on OMAP > > > > > -Original Mess

RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread JAIN, AMBER
> -Original Message- > From: Hiremath, Vaibhav > Sent: Tuesday, May 31, 2011 5:07 PM > To: JAIN, AMBER; linux-media@vger.kernel.org > Cc: sakari.ai...@iki.fi > Subject: RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is > not configured on OMAP > > > > -Original Messag

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Guennadi Liakhovetski
On Tue, 31 May 2011, Koen Kooi wrote: > > Op 31 mei 2011, om 15:42 heeft javier Martin het volgende geschreven: > > > On 31 May 2011 15:34, Koen Kooi wrote: > >> root@beagleboardxMC:~# yavta -f SGRBG8 -s 320x240 -n 4 --capture=10 --skip > >> 3 -F `media-ctl -e "OMAP3 ISP CCDC output"` > >> Dev

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread javier Martin
On 31 May 2011 16:01, Koen Kooi wrote: > > Op 31 mei 2011, om 15:42 heeft javier Martin het volgende geschreven: > >> On 31 May 2011 15:34, Koen Kooi wrote: >>> root@beagleboardxMC:~# yavta -f SGRBG8 -s 320x240 -n 4 --capture=10 --skip >>> 3 -F `media-ctl -e "OMAP3 ISP CCDC output"` >>> Device /

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Koen Kooi
Op 31 mei 2011, om 15:42 heeft javier Martin het volgende geschreven: > On 31 May 2011 15:34, Koen Kooi wrote: >> root@beagleboardxMC:~# yavta -f SGRBG8 -s 320x240 -n 4 --capture=10 --skip 3 >> -F `media-ctl -e "OMAP3 ISP CCDC output"` >> Device /dev/video2 opened. >> Device `OMAP3 ISP CCDC out

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Guennadi Liakhovetski
On Tue, 31 May 2011, Koen Kooi wrote: > Op 31 mei 2011, om 11:46 heeft Javier Martin het volgende geschreven: > > > diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c > > b/arch/arm/mach-omap2/board-omap3beagle-camera.c > > new file mode 100644 > > index 000..04365b2 > > --- /dev/nu

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread javier Martin
On 31 May 2011 15:34, Koen Kooi wrote: > root@beagleboardxMC:~# yavta -f SGRBG8 -s 320x240 -n 4 --capture=10 --skip 3 > -F `media-ctl -e "OMAP3 ISP CCDC output"` > Device /dev/video2 opened. > Device `OMAP3 ISP CCDC output' on `media' is a video capture device. > Video format set: SGRBG8 (4742524

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Koen Kooi
root@beagleboardxMC:~# yavta -f SGRBG8 -s 320x240 -n 4 --capture=10 --skip 3 -F `media-ctl -e "OMAP3 ISP CCDC output"` Device /dev/video2 opened. Device `OMAP3 ISP CCDC output' on `media' is a video capture device. Video format set: SGRBG8 (47425247) 320x240 buffer size 76800 Video format: SGRBG8

Re: [beagleboard] [PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Koen Kooi
Op 31 mei 2011, om 11:46 heeft Javier Martin het volgende geschreven: > diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c > b/arch/arm/mach-omap2/board-omap3beagle-camera.c > new file mode 100644 > index 000..04365b2 > --- /dev/null > +++ b/arch/arm/mach-omap2/board-omap3beagle-came

Re: v4l2 device property framework in userspace

2011-05-31 Thread Mauro Carvalho Chehab
Hi Martin, Em 31-05-2011 08:33, Martin Strubel escreveu: > Hi, > >> >> Not religion, it's experience. I understand what you want to do and it is >> just a bad idea in the long term. Mind you, it's great for prototyping and >> experimentation. But if you want to get stable sensor support in the ke

[PATCH] update dvb-c scanfile hu-Digikabel

2011-05-31 Thread Marton Balint
# HG changeset patch # User Marton Balint # Date 1306844422 -7200 # Node ID 15083eb9eb32e906d2961597965320d328b3782e # Parent 7ebf32ed9124c7e58049dc9f59b514a222757b7d update dvb-c scanfile hu-Digikabel diff -r 7ebf32ed9124 -r 15083eb9eb32 util/scan/dvb-c/hu-Digikabel --- a/util/scan/dvb-c/hu-Dig

RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread Hiremath, Vaibhav
> -Original Message- > From: JAIN, AMBER > Sent: Tuesday, May 31, 2011 3:59 PM > To: linux-media@vger.kernel.org > Cc: Hiremath, Vaibhav; sakari.ai...@iki.fi > Subject: RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is > not configured on OMAP > > I have tested it on OMAP44

Re: v4l2 device property framework in userspace

2011-05-31 Thread Martin Strubel
Hi, > > Not religion, it's experience. I understand what you want to do and it is > just a bad idea in the long term. Mind you, it's great for prototyping and > experimentation. But if you want to get stable sensor support in the kernel, > then it has to conform to the rules. Having some sensor d

Re: v4l2 device property framework in userspace

2011-05-31 Thread Hans Verkuil
On Tuesday, May 31, 2011 10:27:38 Martin Strubel wrote: > > > > > Userspace tells the driver what it should do and the driver decides how to > > do it. > > That's how it works. > > Sounds a little religious. Not sure if you've been listening.. Not religion, it's experience. I understand what y

RE: [PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread JAIN, AMBER
I have tested it on OMAP4430 blaze and OMAP3430 SDP platforms. I do not have the hardware to test omap24xxcam change. Can someone please help me on this? Thanks, Amber > -Original Message- > From: JAIN, AMBER > Sent: Tuesday, May 31, 2011 3:22 PM > To: linux-media@vger.kernel.org > Cc:

Re: [PATCH v4 0/3] TV driver for Samsung S5P platform (media part)

2011-05-31 Thread Tomasz Stanislawski
JiUn Yu wrote: 5. Mixer & Video Processor driver. It is called 's5p-mixer' because of historical reasons. It was decided combine VP and MXR drivers into one because of shared interrupt and very similar interface via V4L2 nodes. The driver is a realization of many-to-many relation between multi

Re: omap3isp - H3A auto white balance

2011-05-31 Thread Daniel Lundborg
Hi Laurent, > Hi Daniel, > > On Tuesday 31 May 2011 11:45:13 Daniel Lundborg wrote: > > > On Thursday 26 May 2011 15:06:17 Daniel Lundborg wrote: > > > > > On Thursday 26 May 2011 10:57:39 Daniel Lundborg wrote: > > > > > > Hello, > > > > > > > > > > > > I am developing a camera sensor driver fo

Re: omap3isp - H3A auto white balance

2011-05-31 Thread Laurent Pinchart
Hi Daniel, On Tuesday 31 May 2011 11:45:13 Daniel Lundborg wrote: > > On Thursday 26 May 2011 15:06:17 Daniel Lundborg wrote: > > > > On Thursday 26 May 2011 10:57:39 Daniel Lundborg wrote: > > > > > Hello, > > > > > > > > > > I am developing a camera sensor driver for the Aptina MT9V034. I > > >

Re: omap3isp - H3A auto white balance

2011-05-31 Thread Daniel Lundborg
Hi Laurent, > Hi Daniel, > > On Thursday 26 May 2011 15:06:17 Daniel Lundborg wrote: > > > On Thursday 26 May 2011 10:57:39 Daniel Lundborg wrote: > > > > Hello, > > > > > > > > I am developing a camera sensor driver for the Aptina MT9V034. I > > > > am only using it in snapshot mode and I can

[PATCH] OMAP: V4L2: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP

2011-05-31 Thread Amber Jain
Remove GFP_DMA from the __get_free_pages() call as ZONE_DMA is not configured on OMAP. Earlier the page allocator used to return a page from ZONE_NORMAL even when GFP_DMA is passed and CONFIG_ZONE_DMA is disabled. As a result of commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac, page allocator return

[PATCH v5 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Javier Martin
Since isp clocks have not been exposed yet, this patch includes a temporal solution for testing mt9p031 driver in Beagleboard xM. Signed-off-by: Javier Martin --- arch/arm/mach-omap2/Makefile |1 + arch/arm/mach-omap2/board-omap3beagle-camera.c | 90 ++

[PATCH v5 1/2] Add support for mt9p031 Aptina (Micron) sensor.

2011-05-31 Thread Javier Martin
This patch adds basic support (no controls) for mt9p031 sensor. It applies on kernel 2.6.39. Signed-off-by: Javier Martin --- drivers/media/video/Kconfig |7 + drivers/media/video/Makefile |1 + drivers/media/video/mt9p031.c | 699 + include/me

Re: [beagleboard] [PATCH v4 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread javier Martin
On 31 May 2011 09:59, Koen Kooi wrote: > > Op 31 mei 2011, om 09:52 heeft Koen Kooi het volgende geschreven: > >> >> Op 30 mei 2011, om 10:37 heeft Javier Martin het volgende geschreven: >> >>> Since isp clocks have not been exposed yet, this patch >>> includes a temporal solution for testing mt9p

Re: v4l2 device property framework in userspace

2011-05-31 Thread Martin Strubel
> > Userspace tells the driver what it should do and the driver decides how to do > it. > That's how it works. Sounds a little religious. Not sure if you've been listening.. > >> And for us it is even more reusable, because we can run the >> same thing on a standalone 'OS' (no OS really) and

Re: v4l2 device property framework in userspace

2011-05-31 Thread Hans Verkuil
On Monday, May 30, 2011 15:30:23 Martin Strubel wrote: > Hi, > > > > > The XML is basically just a dump of all the sensor registers, right? > > > > There are two sections: The register tables, and the property wrappers. > Property wrappers don't have to necessarily link to registers, but > that

Re: [beagleboard] [PATCH v4 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Koen Kooi
Op 31 mei 2011, om 09:52 heeft Koen Kooi het volgende geschreven: > > Op 30 mei 2011, om 10:37 heeft Javier Martin het volgende geschreven: > >> Since isp clocks have not been exposed yet, this patch >> includes a temporal solution for testing mt9p031 driver >> in Beagleboard xM. > > When comp

Re: [beagleboard] [PATCH v4 2/2] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM.

2011-05-31 Thread Koen Kooi
Op 30 mei 2011, om 10:37 heeft Javier Martin het volgende geschreven: > Since isp clocks have not been exposed yet, this patch > includes a temporal solution for testing mt9p031 driver > in Beagleboard xM. When compiling both as Y I get: [4.231628] mt9p031 2-0048: Failed to reset the camera

[PATCH v2 1/4] m5mols: Fix capture image size register definition

2011-05-31 Thread HeungJun, Kim
The main capture and the thumbnail image size registers were erroneously defined to have 1 byte width, resulting in wrong reported image size. Fix this by changing the registers width to correct value. Reported-by: Sylwester Nawrocki Signed-off-by: HeungJun, Kim Signed-off-by: Kyungmin Park ---

[PATCH v2 4/4] m5mols: add parenthesis <> for the head and back of email address

2011-05-31 Thread HeungJun, Kim
Signed-off-by: HeungJun, Kim Signed-off-by: Kyungmin Park --- drivers/media/video/m5mols/m5mols.h |4 ++-- drivers/media/video/m5mols/m5mols_capture.c |4 ++-- drivers/media/video/m5mols/m5mols_controls.c |4 ++-- drivers/media/video/m5mols/m5mols_core.c |4 ++-- dr

[PATCH v2 3/4] m5mols: remove union in the m5mols_get_version(), and VERSION_SIZE

2011-05-31 Thread HeungJun, Kim
Remove union version in the m5mols_get_version(), and read version information directly. Also remove VERSION_SIZE. Signed-off-by: HeungJun, Kim Signed-off-by: Kyungmin Park --- drivers/media/video/m5mols/m5mols.h |1 - drivers/media/video/m5mols/m5mols_core.c | 42 +++

[PATCH v2 2/4] m5mols: add m5mols_read_u8/u16/u32() according to I2C byte width

2011-05-31 Thread HeungJun, Kim
For now, the m5mols_read() share in case of I2C packet 1, 2, 4 byte(s) width. So, this commit adds 3 functions - m5mols_read_u8/u16/u32() according to byte width of I2C packet. And, the u32 variables in spite of u8 or u16 for fitting to m5mols_read() having no choice, is replaced to have original b

[PATCH v2 0/4] Fix micellaneous issues for M-5MOLS driver

2011-05-31 Thread HeungJun, Kim
Hello, This is second verion of patch series to handle some issues about M-5MOLS driver. The difference against first patch series is as follows: 1) Add contents for 1/5. It should be the contents in the each patches, but I've missed it. So, I added the contents in the patch. 2)