Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c02d7da3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "Three driver fixes:

   - fix for omap4, fixing a regression due to a subsystem API that got
     removed for 4.1 (commit efde2346);

   - fix for one of the formats supported by Marvel ccic driver;

   - fix rcar_vin driver that, when stopping abnormally, the driver
     can't return from wait_for_completion"

* tag 'media/v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] v4l: omap4iss: Replace outdated OMAP4 control pad API with syscon
  [media] media: soc_camera: rcar_vin: Fix wait_for_completion
  [media] marvell-ccic: fix Y'CbCr ordering
parents 5ebe6afa fefad2d5

drivers/media/platform/marvell-ccic/mcam-core.c

+7 −7
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ static struct mcam_format_struct { 
		.planar		= false,

	},

	{

		.desc		= "UYVY 4:2:2",

		.pixelformat	= V4L2_PIX_FMT_UYVY,

		.desc		= "YVYU 4:2:2",

		.pixelformat	= V4L2_PIX_FMT_YVYU,

		.mbus_code	= MEDIA_BUS_FMT_YUYV8_2X8,

		.bpp		= 2,

		.planar		= false,
@@ -748,7 +748,7 @@ static void mcam_ctlr_image(struct mcam_camera *cam) 


	switch (fmt->pixelformat) {

	case V4L2_PIX_FMT_YUYV:

	case V4L2_PIX_FMT_UYVY:

	case V4L2_PIX_FMT_YVYU:

		widthy = fmt->width * 2;

		widthuv = 0;

		break;
@@ -784,15 +784,15 @@ static void mcam_ctlr_image(struct mcam_camera *cam) 
	case V4L2_PIX_FMT_YUV420:

	case V4L2_PIX_FMT_YVU420:

		mcam_reg_write_mask(cam, REG_CTRL0,

			C0_DF_YUV | C0_YUV_420PL | C0_YUVE_YVYU, C0_DF_MASK);

			C0_DF_YUV | C0_YUV_420PL | C0_YUVE_VYUY, C0_DF_MASK);

		break;

	case V4L2_PIX_FMT_YUYV:

		mcam_reg_write_mask(cam, REG_CTRL0,

			C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_UYVY, C0_DF_MASK);

			C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_NOSWAP, C0_DF_MASK);

		break;

	case V4L2_PIX_FMT_UYVY:

	case V4L2_PIX_FMT_YVYU:

		mcam_reg_write_mask(cam, REG_CTRL0,

			C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_YUYV, C0_DF_MASK);

			C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_SWAP24, C0_DF_MASK);

		break;

	case V4L2_PIX_FMT_JPEG:

		mcam_reg_write_mask(cam, REG_CTRL0,

drivers/media/platform/marvell-ccic/mcam-core.h

+4 −4
Original line number Diff line number Diff line
@@ -330,10 +330,10 @@ int mccic_resume(struct mcam_camera *cam); 
#define	  C0_YUVE_YVYU	  0x00010000	/* Y1CrY0Cb		*/

#define	  C0_YUVE_VYUY	  0x00020000	/* CrY1CbY0		*/

#define	  C0_YUVE_UYVY	  0x00030000	/* CbY1CrY0		*/

#define	  C0_YUVE_XYUV	  0x00000000	/* 420: .YUV		*/

#define	  C0_YUVE_XYVU	  0x00010000	/* 420: .YVU		*/

#define	  C0_YUVE_XUVY	  0x00020000	/* 420: .UVY		*/

#define	  C0_YUVE_XVUY	  0x00030000	/* 420: .VUY		*/

#define	  C0_YUVE_NOSWAP  0x00000000	/* no bytes swapping	*/

#define	  C0_YUVE_SWAP13  0x00010000	/* swap byte 1 and 3	*/

#define	  C0_YUVE_SWAP24  0x00020000	/* swap byte 2 and 4	*/

#define	  C0_YUVE_SWAP1324 0x00030000	/* swap bytes 1&3 and 2&4 */

/* Bayer bits 18,19 if needed */

#define	  C0_EOF_VSYNC	  0x00400000	/* Generate EOF by VSYNC */

#define	  C0_VEDGE_CTRL   0x00800000	/* Detect falling edge of VSYNC */

drivers/media/platform/soc_camera/rcar_vin.c

+6 −1
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ 
#define VIN_MAX_WIDTH		2048

#define VIN_MAX_HEIGHT		2048



#define TIMEOUT_MS		100



enum chip_id {

	RCAR_GEN2,

	RCAR_H1,
@@ -820,7 +822,10 @@ static void rcar_vin_wait_stop_streaming(struct rcar_vin_priv *priv) 
		if (priv->state == STOPPING) {

			priv->request_to_stop = true;

			spin_unlock_irq(&priv->lock);

			wait_for_completion(&priv->capture_stop);

			if (!wait_for_completion_timeout(

					&priv->capture_stop,

					msecs_to_jiffies(TIMEOUT_MS)))

				priv->state = STOPPED;

			spin_lock_irq(&priv->lock);

		}

	}

drivers/staging/media/omap4iss/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config VIDEO_OMAP4 
	bool "OMAP 4 Camera support"

	depends on VIDEO_V4L2=y && VIDEO_V4L2_SUBDEV_API && I2C=y && ARCH_OMAP4

	depends on HAS_DMA

	select MFD_SYSCON

	select VIDEOBUF2_DMA_CONTIG

	---help---

	  Driver for an OMAP 4 ISS controller.

drivers/staging/media/omap4iss/iss.c

+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/slab.h>
@@ -1386,6 +1387,16 @@ static int iss_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, iss);



	/*

	 * TODO: When implementing DT support switch to syscon regmap lookup by

	 * phandle.

	 */

	iss->syscon = syscon_regmap_lookup_by_compatible("syscon");

	if (IS_ERR(iss->syscon)) {

		ret = PTR_ERR(iss->syscon);

		goto error;

	}



	/* Clocks */

	ret = iss_map_mem_resource(pdev, iss, OMAP4_ISS_MEM_TOP);

	if (ret < 0)