linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support
@ 2013-12-23 20:28 Valentine Barshak
  2013-12-26 14:18 ` Laurent Pinchart
                   ` (6 more replies)
  0 siblings, 7 replies; 21+ messages in thread
From: Valentine Barshak @ 2013-12-23 20:28 UTC (permalink / raw)
  To: linux-sh, linux-media
  Cc: Simon Horman, Magnus Damm, Kuninori Morimoto, Laurent Pinchart,
	Mauro Carvalho Chehab, Hans Verkuil, Guennadi Liakhovetski

This adds R-Car M2 (R8A7791) VIN support.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
---
 drivers/media/platform/soc_camera/rcar_vin.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 6866bb4..8b79727 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -106,6 +106,7 @@
 #define VIN_MAX_HEIGHT		2048
 
 enum chip_id {
+	RCAR_M2,
 	RCAR_H2,
 	RCAR_H1,
 	RCAR_M1,
@@ -302,8 +303,8 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
 		dmr = 0;
 		break;
 	case V4L2_PIX_FMT_RGB32:
-		if (priv->chip = RCAR_H2 || priv->chip = RCAR_H1 ||
-		    priv->chip = RCAR_E1) {
+		if (priv->chip = RCAR_M2 || priv->chip = RCAR_H2 ||
+		    priv->chip = RCAR_H1 || priv->chip = RCAR_E1) {
 			dmr = VNDMR_EXRGB;
 			break;
 		}
@@ -1384,6 +1385,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = {
 };
 
 static struct platform_device_id rcar_vin_id_table[] = {
+	{ "r8a7791-vin",  RCAR_M2 },
 	{ "r8a7790-vin",  RCAR_H2 },
 	{ "r8a7779-vin",  RCAR_H1 },
 	{ "r8a7778-vin",  RCAR_M1 },
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2016-01-09 10:46 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-23 20:28 [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support Valentine Barshak
2013-12-26 14:18 ` Laurent Pinchart
2013-12-26 14:31   ` Valentine
2014-02-24 15:49 ` [PATCH] media: soc_camera: rcar_vin: Add support for 10-bit YUV cameras Phil Edworthy
2014-02-24 18:38   ` Laurent Pinchart
2014-02-25  9:10     ` [PATCH v2] " Phil Edworthy
2014-02-25 13:40       ` Vladimir Barinov
2014-02-25 13:40     ` [PATCH] " Valentine
2014-10-14  6:22 ` [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support Yoshihiro Kaneko
2014-10-16  5:23   ` Simon Horman
2014-10-18 14:55   ` Sergei Shtylyov
2014-10-14  6:24 ` [PATCH] media: soc_camera: rcar_vin: Add YUYV capture format support Yoshihiro Kaneko
2014-10-16  5:24   ` Simon Horman
2014-10-20  2:51 ` [PATCH] media: soc_camera: rcar_vin: Add DT support for r8a7793 and r8a7794 SoCs Yoshihiro Kaneko
2014-10-20 16:20   ` Simon Horman
2014-10-31  9:08 ` [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support Yoshihiro Kaneko
2014-10-31 13:00   ` Sergei Shtylyov
2015-12-13 15:27 ` [PATCH] media: soc_camera: rcar_vin: Add R-Car Gen3 support Yoshihiro Kaneko
2015-12-13 17:43   ` Sergei Shtylyov
2015-12-20  9:52     ` Yoshihiro Kaneko
2016-01-09 10:46     ` Guennadi Liakhovetski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).