diff for duplicates of <52BC3DB5.9090605@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 09b7b99..aab2739 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,14 +43,15 @@ I wouldn't mind to use the same (GEN2) id for both but we may need to split them >> 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 c750eb4..734137e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01590143.Lfusyumoi4@avalon\0" "From\0Valentine <valentine.barshak@cogentembedded.com>\0" "Subject\0Re: [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support\0" - "Date\0Thu, 26 Dec 2013 14:31:17 +0000\0" + "Date\0Thu, 26 Dec 2013 18:31:17 +0400\0" "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Cc\0linux-sh@vger.kernel.org" linux-media@vger.kernel.org @@ -59,14 +59,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" @@ -78,4 +79,4 @@ "Thanks,\n" Val. -f330620e890e87b39cff34bd74df153234a0242746394524e0a2976397165669 +0565394abda12436a0cbae97268c04bfc1c8f386f4bd18e4f472d657b1f999ef
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.