diff for duplicates of <516D452F.2000109@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 3fb9992..5cbaf67 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On 04/11/2013 05:00 PM, Jean-Christophe PLAGNIOL-VILLARD : > Fix it and introduce a new struct atmel_lcdfb_pdata for platform data only > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> -> Cc: linux-fbdev@vger.kernel.org +> Cc: linux-fbdev at vger.kernel.org > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no> @@ -587,8 +587,8 @@ Is comment still relevant? > else > var->green.length = 6; > -> - if (sinfo->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { -> + if (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { +> - if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { +> + if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { > /* RGB:5X5 mode */ > var->red.offset = var->green.length + 5; > var->blue.offset = 0; @@ -596,8 +596,8 @@ Is comment still relevant? > var->transp.length = 8; > /* fall through */ > case 24: -> - if (sinfo->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { -> + if (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { +> - if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { +> + if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { > /* RGB:888 mode */ > var->red.offset = 16; > var->blue.offset = 0; @@ -630,9 +630,9 @@ Is comment still relevant? > */ > } else { > /* new style BGR:565 / RGB:565 */ -> - if (sinfo->lcd_wiring_mode = +> - if (sinfo->lcd_wiring_mode == > - ATMEL_LCDC_WIRING_RGB) { -> + if (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { +> + if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { > val = ((blue >> 11) & 0x001f); > val |= ((red >> 0) & 0xf800); > } else { diff --git a/a/content_digest b/N1/content_digest index ccba81a..e17ed17 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020130411145741.GB25242@game.jcrosoft.org\0" "ref\01365692422-9565-1-git-send-email-plagnioj@jcrosoft.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [PATCH 1/8] video: atmel_lcdfb: fix platform data struct\0" - "Date\0Tue, 16 Apr 2013 12:33:51 +0000\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH 1/8] video: atmel_lcdfb: fix platform data struct\0" + "Date\0Tue, 16 Apr 2013 14:33:51 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -11,7 +11,7 @@ "> Fix it and introduce a new struct atmel_lcdfb_pdata for platform data only\n" "> \n" "> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\n" - "> Cc: linux-fbdev@vger.kernel.org\n" + "> Cc: linux-fbdev at vger.kernel.org\n" "> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>\n" "> Cc: Andrew Morton <akpm@linux-foundation.org>\n" "> Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>\n" @@ -595,8 +595,8 @@ "> \t\telse\n" "> \t\t\tvar->green.length = 6;\n" "> \n" - "> -\t\tif (sinfo->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" - "> +\t\tif (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" + "> -\t\tif (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" + "> +\t\tif (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" "> \t\t\t/* RGB:5X5 mode */\n" "> \t\t\tvar->red.offset = var->green.length + 5;\n" "> \t\t\tvar->blue.offset = 0;\n" @@ -604,8 +604,8 @@ "> \t\tvar->transp.length = 8;\n" "> \t\t/* fall through */\n" "> \tcase 24:\n" - "> -\t\tif (sinfo->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" - "> +\t\tif (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" + "> -\t\tif (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" + "> +\t\tif (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" "> \t\t\t/* RGB:888 mode */\n" "> \t\t\tvar->red.offset = 16;\n" "> \t\t\tvar->blue.offset = 0;\n" @@ -638,9 +638,9 @@ "> \t\t\t\t */\n" "> \t\t\t} else {\n" "> \t\t\t\t/* new style BGR:565 / RGB:565 */\n" - "> -\t\t\t\tif (sinfo->lcd_wiring_mode =\n" + "> -\t\t\t\tif (sinfo->lcd_wiring_mode ==\n" "> -\t\t\t\t ATMEL_LCDC_WIRING_RGB) {\n" - "> +\t\t\t\tif (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" + "> +\t\t\t\tif (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" "> \t\t\t\t\tval = ((blue >> 11) & 0x001f);\n" "> \t\t\t\t\tval |= ((red >> 0) & 0xf800);\n" "> \t\t\t\t} else {\n" @@ -810,4 +810,4 @@ "-- \n" Nicolas Ferre -215c63b93dd0cb10784df608adc512225518ff93a565a0c97083cb831e4561d7 +19dedbe2f10569c0a73d7103edd19c2c3879fe9f0daeaceed44d2bcd121b1f22
diff --git a/a/1.txt b/N2/1.txt index 3fb9992..3cfdfd4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -587,8 +587,8 @@ Is comment still relevant? > else > var->green.length = 6; > -> - if (sinfo->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { -> + if (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { +> - if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { +> + if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { > /* RGB:5X5 mode */ > var->red.offset = var->green.length + 5; > var->blue.offset = 0; @@ -596,8 +596,8 @@ Is comment still relevant? > var->transp.length = 8; > /* fall through */ > case 24: -> - if (sinfo->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { -> + if (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { +> - if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { +> + if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { > /* RGB:888 mode */ > var->red.offset = 16; > var->blue.offset = 0; @@ -630,9 +630,9 @@ Is comment still relevant? > */ > } else { > /* new style BGR:565 / RGB:565 */ -> - if (sinfo->lcd_wiring_mode = +> - if (sinfo->lcd_wiring_mode == > - ATMEL_LCDC_WIRING_RGB) { -> + if (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) { +> + if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { > val = ((blue >> 11) & 0x001f); > val |= ((red >> 0) & 0xf800); > } else { diff --git a/a/content_digest b/N2/content_digest index ccba81a..2c0c32e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,13 @@ "ref\01365692422-9565-1-git-send-email-plagnioj@jcrosoft.com\0" "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" "Subject\0Re: [PATCH 1/8] video: atmel_lcdfb: fix platform data struct\0" - "Date\0Tue, 16 Apr 2013 12:33:51 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 16 Apr 2013 14:33:51 +0200\0" + "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + devicetree-discuss@lists.ozlabs.org + linux-fbdev@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " Hans-Christian Egtvedt <egtvedt@samfundet.no>\0" "\00:1\0" "b\0" "On 04/11/2013 05:00 PM, Jean-Christophe PLAGNIOL-VILLARD :\n" @@ -595,8 +600,8 @@ "> \t\telse\n" "> \t\t\tvar->green.length = 6;\n" "> \n" - "> -\t\tif (sinfo->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" - "> +\t\tif (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" + "> -\t\tif (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" + "> +\t\tif (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" "> \t\t\t/* RGB:5X5 mode */\n" "> \t\t\tvar->red.offset = var->green.length + 5;\n" "> \t\t\tvar->blue.offset = 0;\n" @@ -604,8 +609,8 @@ "> \t\tvar->transp.length = 8;\n" "> \t\t/* fall through */\n" "> \tcase 24:\n" - "> -\t\tif (sinfo->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" - "> +\t\tif (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" + "> -\t\tif (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" + "> +\t\tif (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" "> \t\t\t/* RGB:888 mode */\n" "> \t\t\tvar->red.offset = 16;\n" "> \t\t\tvar->blue.offset = 0;\n" @@ -638,9 +643,9 @@ "> \t\t\t\t */\n" "> \t\t\t} else {\n" "> \t\t\t\t/* new style BGR:565 / RGB:565 */\n" - "> -\t\t\t\tif (sinfo->lcd_wiring_mode =\n" + "> -\t\t\t\tif (sinfo->lcd_wiring_mode ==\n" "> -\t\t\t\t ATMEL_LCDC_WIRING_RGB) {\n" - "> +\t\t\t\tif (pdata->lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB) {\n" + "> +\t\t\t\tif (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {\n" "> \t\t\t\t\tval = ((blue >> 11) & 0x001f);\n" "> \t\t\t\t\tval |= ((red >> 0) & 0xf800);\n" "> \t\t\t\t} else {\n" @@ -810,4 +815,4 @@ "-- \n" Nicolas Ferre -215c63b93dd0cb10784df608adc512225518ff93a565a0c97083cb831e4561d7 +95d72d14e0e18db9726244a4b8d0f496e8dd2b3daf5af0ae24d7855fd3a591ea
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.