diff for duplicates of <1368868514-18975-3-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index 09b1c73..8916ccc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -446,9 +446,9 @@ index 4aaeb18..68de46a 100644 @@ -65,20 +225,20 @@ void wmt_ge_fillrect(struct fb_info *p, const struct fb_fillrect *rect) p->fbops->fb_sync(p); - writel(p->var.bits_per_pixel = 32 ? 3 : -- (p->var.bits_per_pixel = 8 ? 0 : 1), regbase + GE_DEPTH_OFF); -- writel(p->var.bits_per_pixel = 15 ? 1 : 0, regbase + GE_HIGHCOLOR_OFF); + writel(p->var.bits_per_pixel == 32 ? 3 : +- (p->var.bits_per_pixel == 8 ? 0 : 1), regbase + GE_DEPTH_OFF); +- writel(p->var.bits_per_pixel == 15 ? 1 : 0, regbase + GE_HIGHCOLOR_OFF); - writel(p->fix.smem_start, regbase + GE_DESTBASE_OFF); - writel(p->var.xres_virtual - 1, regbase + GE_DESTDISPW_OFF); - writel(p->var.yres_virtual - 1, regbase + GE_DESTDISPH_OFF); @@ -459,10 +459,10 @@ index 4aaeb18..68de46a 100644 - - writel(pat, regbase + GE_PAT0C_OFF); - writel(1, regbase + GE_COMMAND_OFF); -- writel(rect->rop = ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROPCODE_OFF); +- writel(rect->rop == ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROPCODE_OFF); - writel(1, regbase + GE_FIRE_OFF); -+ (p->var.bits_per_pixel = 8 ? 0 : 1), regbase + GE_COLOR_DEPTH); -+ writel(p->var.bits_per_pixel = 15 ? 1 : 0, regbase + GE_HM_SEL); ++ (p->var.bits_per_pixel == 8 ? 0 : 1), regbase + GE_COLOR_DEPTH); ++ writel(p->var.bits_per_pixel == 15 ? 1 : 0, regbase + GE_HM_SEL); + writel(p->fix.smem_start, regbase + GE_DES_BADDR); + writel(p->var.xres_virtual - 1, regbase + GE_DES_DISP_W); + writel(p->var.yres_virtual - 1, regbase + GE_DES_DISP_H); @@ -473,7 +473,7 @@ index 4aaeb18..68de46a 100644 + + writel(pat, regbase + GE_PAT0_COLOR); + writel(1, regbase + GE_COMMAND); -+ writel(rect->rop = ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROP_CODE); ++ writel(rect->rop == ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROP_CODE); + writel(1, regbase + GE_FIRE); } EXPORT_SYMBOL_GPL(wmt_ge_fillrect); diff --git a/a/content_digest b/N1/content_digest index 0f0e90d..04f7c88 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01368868514-18975-1-git-send-email-linux@prisktech.co.nz\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "From\0linux@prisktech.co.nz (Tony Prisk)\0" "Subject\0[PATCH 2/4] fb: vt8500: Convert to use vendor register names\0" - "Date\0Sat, 18 May 2013 09:15:12 +0000\0" + "Date\0Sat, 18 May 2013 21:15:12 +1200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -453,9 +453,9 @@ "@@ -65,20 +225,20 @@ void wmt_ge_fillrect(struct fb_info *p, const struct fb_fillrect *rect)\n" " \t\tp->fbops->fb_sync(p);\n" " \n" - " \twritel(p->var.bits_per_pixel = 32 ? 3 :\n" - "-\t (p->var.bits_per_pixel = 8 ? 0 : 1), regbase + GE_DEPTH_OFF);\n" - "-\twritel(p->var.bits_per_pixel = 15 ? 1 : 0, regbase + GE_HIGHCOLOR_OFF);\n" + " \twritel(p->var.bits_per_pixel == 32 ? 3 :\n" + "-\t (p->var.bits_per_pixel == 8 ? 0 : 1), regbase + GE_DEPTH_OFF);\n" + "-\twritel(p->var.bits_per_pixel == 15 ? 1 : 0, regbase + GE_HIGHCOLOR_OFF);\n" "-\twritel(p->fix.smem_start, regbase + GE_DESTBASE_OFF);\n" "-\twritel(p->var.xres_virtual - 1, regbase + GE_DESTDISPW_OFF);\n" "-\twritel(p->var.yres_virtual - 1, regbase + GE_DESTDISPH_OFF);\n" @@ -466,10 +466,10 @@ "-\n" "-\twritel(pat, regbase + GE_PAT0C_OFF);\n" "-\twritel(1, regbase + GE_COMMAND_OFF);\n" - "-\twritel(rect->rop = ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROPCODE_OFF);\n" + "-\twritel(rect->rop == ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROPCODE_OFF);\n" "-\twritel(1, regbase + GE_FIRE_OFF);\n" - "+\t (p->var.bits_per_pixel = 8 ? 0 : 1), regbase + GE_COLOR_DEPTH);\n" - "+\twritel(p->var.bits_per_pixel = 15 ? 1 : 0, regbase + GE_HM_SEL);\n" + "+\t (p->var.bits_per_pixel == 8 ? 0 : 1), regbase + GE_COLOR_DEPTH);\n" + "+\twritel(p->var.bits_per_pixel == 15 ? 1 : 0, regbase + GE_HM_SEL);\n" "+\twritel(p->fix.smem_start, regbase + GE_DES_BADDR);\n" "+\twritel(p->var.xres_virtual - 1, regbase + GE_DES_DISP_W);\n" "+\twritel(p->var.yres_virtual - 1, regbase + GE_DES_DISP_H);\n" @@ -480,7 +480,7 @@ "+\n" "+\twritel(pat, regbase + GE_PAT0_COLOR);\n" "+\twritel(1, regbase + GE_COMMAND);\n" - "+\twritel(rect->rop = ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROP_CODE);\n" + "+\twritel(rect->rop == ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROP_CODE);\n" "+\twritel(1, regbase + GE_FIRE);\n" " }\n" " EXPORT_SYMBOL_GPL(wmt_ge_fillrect);\n" @@ -554,4 +554,4 @@ "-- \n" 1.7.9.5 -89a458748cae2eee6aafc7b5350322b8658dd20bcd8bab718f7784564c956b20 +1ea4288cdfa65f30230cb6310622b3a14dbfc0349a5988fb84048202aa96e8f5
diff --git a/a/1.txt b/N2/1.txt index 09b1c73..8916ccc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -446,9 +446,9 @@ index 4aaeb18..68de46a 100644 @@ -65,20 +225,20 @@ void wmt_ge_fillrect(struct fb_info *p, const struct fb_fillrect *rect) p->fbops->fb_sync(p); - writel(p->var.bits_per_pixel = 32 ? 3 : -- (p->var.bits_per_pixel = 8 ? 0 : 1), regbase + GE_DEPTH_OFF); -- writel(p->var.bits_per_pixel = 15 ? 1 : 0, regbase + GE_HIGHCOLOR_OFF); + writel(p->var.bits_per_pixel == 32 ? 3 : +- (p->var.bits_per_pixel == 8 ? 0 : 1), regbase + GE_DEPTH_OFF); +- writel(p->var.bits_per_pixel == 15 ? 1 : 0, regbase + GE_HIGHCOLOR_OFF); - writel(p->fix.smem_start, regbase + GE_DESTBASE_OFF); - writel(p->var.xres_virtual - 1, regbase + GE_DESTDISPW_OFF); - writel(p->var.yres_virtual - 1, regbase + GE_DESTDISPH_OFF); @@ -459,10 +459,10 @@ index 4aaeb18..68de46a 100644 - - writel(pat, regbase + GE_PAT0C_OFF); - writel(1, regbase + GE_COMMAND_OFF); -- writel(rect->rop = ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROPCODE_OFF); +- writel(rect->rop == ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROPCODE_OFF); - writel(1, regbase + GE_FIRE_OFF); -+ (p->var.bits_per_pixel = 8 ? 0 : 1), regbase + GE_COLOR_DEPTH); -+ writel(p->var.bits_per_pixel = 15 ? 1 : 0, regbase + GE_HM_SEL); ++ (p->var.bits_per_pixel == 8 ? 0 : 1), regbase + GE_COLOR_DEPTH); ++ writel(p->var.bits_per_pixel == 15 ? 1 : 0, regbase + GE_HM_SEL); + writel(p->fix.smem_start, regbase + GE_DES_BADDR); + writel(p->var.xres_virtual - 1, regbase + GE_DES_DISP_W); + writel(p->var.yres_virtual - 1, regbase + GE_DES_DISP_H); @@ -473,7 +473,7 @@ index 4aaeb18..68de46a 100644 + + writel(pat, regbase + GE_PAT0_COLOR); + writel(1, regbase + GE_COMMAND); -+ writel(rect->rop = ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROP_CODE); ++ writel(rect->rop == ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROP_CODE); + writel(1, regbase + GE_FIRE); } EXPORT_SYMBOL_GPL(wmt_ge_fillrect); diff --git a/a/content_digest b/N2/content_digest index 0f0e90d..7ef81ca 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,14 @@ "ref\01368868514-18975-1-git-send-email-linux@prisktech.co.nz\0" "From\0Tony Prisk <linux@prisktech.co.nz>\0" "Subject\0[PATCH 2/4] fb: vt8500: Convert to use vendor register names\0" - "Date\0Sat, 18 May 2013 09:15:12 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Sat, 18 May 2013 21:15:12 +1200\0" + "To\0Florian Tobias Schandinat <FlorianSchandinat@gmx.de>\0" + "Cc\0vt8500-wm8505-linux-kernel@googlegroups.com" + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + tomi.valkeinen@ti.com + linux-fbdev@vger.kernel.org + " Tony Prisk <linux@prisktech.co.nz>\0" "\00:1\0" "b\0" "Change all the #defines to match the vendor defined names, and change the\n" @@ -453,9 +459,9 @@ "@@ -65,20 +225,20 @@ void wmt_ge_fillrect(struct fb_info *p, const struct fb_fillrect *rect)\n" " \t\tp->fbops->fb_sync(p);\n" " \n" - " \twritel(p->var.bits_per_pixel = 32 ? 3 :\n" - "-\t (p->var.bits_per_pixel = 8 ? 0 : 1), regbase + GE_DEPTH_OFF);\n" - "-\twritel(p->var.bits_per_pixel = 15 ? 1 : 0, regbase + GE_HIGHCOLOR_OFF);\n" + " \twritel(p->var.bits_per_pixel == 32 ? 3 :\n" + "-\t (p->var.bits_per_pixel == 8 ? 0 : 1), regbase + GE_DEPTH_OFF);\n" + "-\twritel(p->var.bits_per_pixel == 15 ? 1 : 0, regbase + GE_HIGHCOLOR_OFF);\n" "-\twritel(p->fix.smem_start, regbase + GE_DESTBASE_OFF);\n" "-\twritel(p->var.xres_virtual - 1, regbase + GE_DESTDISPW_OFF);\n" "-\twritel(p->var.yres_virtual - 1, regbase + GE_DESTDISPH_OFF);\n" @@ -466,10 +472,10 @@ "-\n" "-\twritel(pat, regbase + GE_PAT0C_OFF);\n" "-\twritel(1, regbase + GE_COMMAND_OFF);\n" - "-\twritel(rect->rop = ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROPCODE_OFF);\n" + "-\twritel(rect->rop == ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROPCODE_OFF);\n" "-\twritel(1, regbase + GE_FIRE_OFF);\n" - "+\t (p->var.bits_per_pixel = 8 ? 0 : 1), regbase + GE_COLOR_DEPTH);\n" - "+\twritel(p->var.bits_per_pixel = 15 ? 1 : 0, regbase + GE_HM_SEL);\n" + "+\t (p->var.bits_per_pixel == 8 ? 0 : 1), regbase + GE_COLOR_DEPTH);\n" + "+\twritel(p->var.bits_per_pixel == 15 ? 1 : 0, regbase + GE_HM_SEL);\n" "+\twritel(p->fix.smem_start, regbase + GE_DES_BADDR);\n" "+\twritel(p->var.xres_virtual - 1, regbase + GE_DES_DISP_W);\n" "+\twritel(p->var.yres_virtual - 1, regbase + GE_DES_DISP_H);\n" @@ -480,7 +486,7 @@ "+\n" "+\twritel(pat, regbase + GE_PAT0_COLOR);\n" "+\twritel(1, regbase + GE_COMMAND);\n" - "+\twritel(rect->rop = ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROP_CODE);\n" + "+\twritel(rect->rop == ROP_XOR ? 0x5a : 0xf0, regbase + GE_ROP_CODE);\n" "+\twritel(1, regbase + GE_FIRE);\n" " }\n" " EXPORT_SYMBOL_GPL(wmt_ge_fillrect);\n" @@ -554,4 +560,4 @@ "-- \n" 1.7.9.5 -89a458748cae2eee6aafc7b5350322b8658dd20bcd8bab718f7784564c956b20 +fa879407713aa5f27be9b07db9489bad6a7ad73517e0bbfd8c193e92ef17401e
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.