diff for duplicates of <1590143.Lfusyumoi4@avalon> diff --git a/a/1.txt b/N1/1.txt index 24cee2f..3693564 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,14 +34,15 @@ or M2 that are not yet supported but will be implemented in the near future). > 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) { +> - 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 > { }; +> @@ -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 }, diff --git a/a/content_digest b/N1/content_digest index 9e079da..58b57e3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01387830486-10650-1-git-send-email-valentine.barshak@cogentembedded.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support\0" - "Date\0Thu, 26 Dec 2013 14:18:47 +0000\0" + "Date\0Thu, 26 Dec 2013 15:18:47 +0100\0" "To\0Valentine Barshak <valentine.barshak@cogentembedded.com>\0" "Cc\0linux-sh@vger.kernel.org" linux-media@vger.kernel.org @@ -49,14 +49,15 @@ "> \t\tdmr = 0;\n" "> \t\tbreak;\n" "> \tcase V4L2_PIX_FMT_RGB32:\n" - "> -\t\tif (priv->chip = RCAR_H2 || priv->chip = RCAR_H1 ||\n" - "> -\t\t priv->chip = RCAR_E1) {\n" - "> +\t\tif (priv->chip = RCAR_M2 || priv->chip = RCAR_H2 ||\n" - "> +\t\t priv->chip = RCAR_H1 || priv->chip = RCAR_E1) {\n" + "> -\t\tif (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 ||\n" + "> -\t\t priv->chip == RCAR_E1) {\n" + "> +\t\tif (priv->chip == RCAR_M2 || priv->chip == RCAR_H2 ||\n" + "> +\t\t priv->chip == RCAR_H1 || priv->chip == RCAR_E1) {\n" "> \t\t\tdmr = VNDMR_EXRGB;\n" "> \t\t\tbreak;\n" "> \t\t}\n" - "> @@ -1384,6 +1385,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops > { };\n" + "> @@ -1384,6 +1385,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops =\n" + "> { };\n" "> \n" "> static struct platform_device_id rcar_vin_id_table[] = {\n" "> +\t{ \"r8a7791-vin\", RCAR_M2 },\n" @@ -69,4 +70,4 @@ "\n" Laurent Pinchart -54f95e27ce6497eb665c5cf53739aa2a5ebbc37d49cc8dea7a083d8232de8179 +ff4fedebed8397e40f6ee21cbebe3d740732ab7dcbee878f3c8b5954e41bd37d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.