aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentine Barshak <valentine.barshak@cogentembedded.com>2013-10-04 10:20:52 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-31 02:39:42 -0400
commitca0c9f17f3737f4857ec0406a75b26b84b2e8c16 (patch)
treec2c422824b8f2320c0a49a24c172d2407a843d99
parentbe353fa188eed6731910ffd35135703eb032cff1 (diff)
[media] media: rcar_vin: Add preliminary r8a7790 support
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/platform/soc_camera/rcar_vin.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index d02a7e0b773f..b21f777f55e7 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -105,6 +105,7 @@
105#define VIN_MAX_HEIGHT 2048 105#define VIN_MAX_HEIGHT 2048
106 106
107enum chip_id { 107enum chip_id {
108 RCAR_H2,
108 RCAR_H1, 109 RCAR_H1,
109 RCAR_M1, 110 RCAR_M1,
110 RCAR_E1, 111 RCAR_E1,
@@ -300,7 +301,8 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
300 dmr = 0; 301 dmr = 0;
301 break; 302 break;
302 case V4L2_PIX_FMT_RGB32: 303 case V4L2_PIX_FMT_RGB32:
303 if (priv->chip == RCAR_H1 || priv->chip == RCAR_E1) { 304 if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 ||
305 priv->chip == RCAR_E1) {
304 dmr = VNDMR_EXRGB; 306 dmr = VNDMR_EXRGB;
305 break; 307 break;
306 } 308 }
@@ -1381,6 +1383,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = {
1381}; 1383};
1382 1384
1383static struct platform_device_id rcar_vin_id_table[] = { 1385static struct platform_device_id rcar_vin_id_table[] = {
1386 { "r8a7790-vin", RCAR_H2 },
1384 { "r8a7779-vin", RCAR_H1 }, 1387 { "r8a7779-vin", RCAR_H1 },
1385 { "r8a7778-vin", RCAR_M1 }, 1388 { "r8a7778-vin", RCAR_M1 },
1386 { "uPD35004-vin", RCAR_E1 }, 1389 { "uPD35004-vin", RCAR_E1 },