diff for duplicates of <1345707346-9035-7-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index 72b7593..cf74a53 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ except PWM. Removed restart.c and moved code into vt8500.c to remove duplicate PMC code. -Signed-off-by: Tony Prisk <linux@prisktech.co.nz> +Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> --- arch/arm/Kconfig | 5 + arch/arm/mach-vt8500/Kconfig | 72 +----- @@ -116,7 +116,7 @@ index 2c20a34..44f9f9d 100644 - well as in Eken M001 tablets and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel€0x480' to your kernel command line. Otherwise, the +- 'panel=800x480' to your kernel command line. Otherwise, the - largest one available will be used. - -config WMT_PANEL_800X600 @@ -126,7 +126,7 @@ index 2c20a34..44f9f9d 100644 - These are found in Eken M003 tablets and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel€0x600' to your kernel command line. Otherwise, the +- 'panel=800x600' to your kernel command line. Otherwise, the - largest one available will be used. - -config WMT_PANEL_1024X576 @@ -137,7 +137,7 @@ index 2c20a34..44f9f9d 100644 - These are found in CherryPal netbooks and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel\x1024x576' to your kernel command line. Otherwise, the +- 'panel=1024x576' to your kernel command line. Otherwise, the - largest one available will be used. - -config WMT_PANEL_1024X600 @@ -147,7 +147,7 @@ index 2c20a34..44f9f9d 100644 - These are found in Eken M006 tablets and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel\x1024x600' to your kernel command line. Otherwise, the +- 'panel=1024x600' to your kernel command line. Otherwise, the - largest one available will be used. + Add support for netbooks, tablets and other devices based on + the reference board design as produced by VIA/WonderMedia, using @@ -179,7 +179,7 @@ index f9fbeb2..0000000 -/* - * arch/arm/mach-vt8500/bv07.c - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by @@ -264,7 +264,7 @@ index 0000000..2b24196 @@ -0,0 +1,28 @@ +/* linux/arch/arm/mach-vt8500/dt_common.h + * -+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> ++ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and @@ -298,7 +298,7 @@ index 19519ae..0000000 @@ -1,91 +0,0 @@ -/* linux/arch/arm/mach-vt8500/devices-vt8500.c - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and @@ -395,7 +395,7 @@ index db4594e..0000000 @@ -1,99 +0,0 @@ -/* linux/arch/arm/mach-vt8500/devices-wm8505.c - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and @@ -500,7 +500,7 @@ index 1fcdc36..0000000 @@ -1,270 +0,0 @@ -/* linux/arch/arm/mach-vt8500/devices.c - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and @@ -643,7 +643,7 @@ index 1fcdc36..0000000 - int i; - - for (i = 0; i < ARRAY_SIZE(panels); i++) { -- if (strcmp(panels[i].mode.name, str) = 0) { +- if (strcmp(panels[i].mode.name, str) == 0) { - current_panel_idx = i; - break; - } @@ -776,7 +776,7 @@ index 188d4e1..0000000 @@ -1,88 +0,0 @@ -/* linux/arch/arm/mach-vt8500/devices.h - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and @@ -870,7 +870,7 @@ index 2bcc0ec..0000000 @@ -1,240 +0,0 @@ -/* linux/arch/arm/mach-vt8500/gpio.c - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and @@ -1129,7 +1129,7 @@ index ecfee91..0000000 -/* - * arch/arm/mach-vt8500/include/mach/vt8500_irqs.h - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by @@ -1223,7 +1223,7 @@ index 29c63ec..0000000 -/* - * arch/arm/mach-vt8500/include/mach/vt8500_regs.h - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by @@ -1308,7 +1308,7 @@ index 6128627..0000000 -/* - * arch/arm/mach-vt8500/include/mach/wm8505_irqs.h - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by @@ -1429,7 +1429,7 @@ index df15509..0000000 -/* - * arch/arm/mach-vt8500/include/mach/wm8505_regs.h - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by @@ -1512,8 +1512,8 @@ index 642de04..f8f9ab9 100644 /* * arch/arm/mach-vt8500/irq.c * -+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> - * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> ++ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> + * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> * * This program is free software; you can redistribute it and/or modify @@ -18,81 +19,102 @@ @@ -1587,7 +1587,8 @@ index 642de04..f8f9ab9 100644 { - void __iomem *base = ic_regbase; - unsigned irq = d->irq; -+ struct vt8500_irq_priv *priv + (struct vt8500_irq_priv *)(d->domain->host_data); ++ struct vt8500_irq_priv *priv = ++ (struct vt8500_irq_priv *)(d->domain->host_data); + void __iomem *base = priv->base; u8 edge; @@ -1621,7 +1622,8 @@ index 642de04..f8f9ab9 100644 { - void __iomem *base = ic_regbase; - unsigned irq = d->irq; -+ struct vt8500_irq_priv *priv + (struct vt8500_irq_priv *)(d->domain->host_data); ++ struct vt8500_irq_priv *priv = ++ (struct vt8500_irq_priv *)(d->domain->host_data); + void __iomem *base = priv->base; u8 dctr; @@ -1641,7 +1643,8 @@ index 642de04..f8f9ab9 100644 - void __iomem *base = ic_regbase; - unsigned irq = d->irq; - unsigned orig_irq = irq; -+ struct vt8500_irq_priv *priv + (struct vt8500_irq_priv *)(d->domain->host_data); ++ struct vt8500_irq_priv *priv = ++ (struct vt8500_irq_priv *)(d->domain->host_data); + void __iomem *base = priv->base; u8 dctr; @@ -1804,7 +1807,7 @@ index 497e89a..0000000 @@ -1,54 +0,0 @@ -/* linux/arch/arm/mach-vt8500/restart.c - * -- * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> +- * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and @@ -1865,8 +1868,8 @@ index d5376c5..050e183 100644 - * arch/arm/mach-vt8500/timer.c + * arch/arm/mach-vt8500/timer_dt.c * -+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> - * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> ++ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> + * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> * * This program is free software; you can redistribute it and/or modify @@ -18,18 +19,25 @@ @@ -2007,7 +2010,7 @@ index 0000000..4494993 +/* + * arch/arm/mach-vt8500/vt8500.c + * -+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> ++ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -2209,7 +2212,7 @@ index db19886..0000000 -/* - * arch/arm/mach-vt8500/wm8505_7in.c - * -- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> +- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by diff --git a/a/content_digest b/N1/content_digest index faa0fab..f328f14 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,25 @@ "ref\01345707346-9035-1-git-send-email-linux@prisktech.co.nz\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "ref\01345707346-9035-1-git-send-email-linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org\0" + "From\0Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\0" "Subject\0[PATCHv4 6/9] arm: vt8500: Update arch-vt8500 to devicetree support.\0" - "Date\0Thu, 23 Aug 2012 07:35:42 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 23 Aug 2012 19:35:42 +1200\0" + "To\0vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" + "Cc\0Alessandro Zummo <a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org>" + linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + Linus Walleij <linus.walleij-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> + Florian Tobias Schandinat <FlorianSchandinat-Mmb7MZpHnFY@public.gmane.org> + Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> + linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> + Mike Turquette <mturquette-l0cyMroinI0@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " Alan Cox <alan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\0" "\00:1\0" "b\0" "Merged existing board files to a single dt-capable file.\n" @@ -15,7 +32,7 @@ "Removed restart.c and moved code into vt8500.c to remove\n" "duplicate PMC code.\n" "\n" - "Signed-off-by: Tony Prisk <linux@prisktech.co.nz>\n" + "Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" "---\n" " arch/arm/Kconfig | 5 +\n" " arch/arm/mach-vt8500/Kconfig | 72 +-----\n" @@ -123,7 +140,7 @@ "-\t well as in Eken M001 tablets and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\342\202\2540x480' to your kernel command line. Otherwise, the\n" + "-\t 'panel=800x480' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "-\n" "-config WMT_PANEL_800X600\n" @@ -133,7 +150,7 @@ "-\t These are found in Eken M003 tablets and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\342\202\2540x600' to your kernel command line. Otherwise, the\n" + "-\t 'panel=800x600' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "-\n" "-config WMT_PANEL_1024X576\n" @@ -144,7 +161,7 @@ "-\t These are found in CherryPal netbooks and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\02024x576' to your kernel command line. Otherwise, the\n" + "-\t 'panel=1024x576' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "-\n" "-config WMT_PANEL_1024X600\n" @@ -154,7 +171,7 @@ "-\t These are found in Eken M006 tablets and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\02024x600' to your kernel command line. Otherwise, the\n" + "-\t 'panel=1024x600' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "+\t Add support for netbooks, tablets and other devices based on\n" "+\t the reference board design as produced by VIA/WonderMedia, using\n" @@ -186,7 +203,7 @@ "-/*\n" "- * arch/arm/mach-vt8500/bv07.c\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This program is free software; you can redistribute it and/or modify\n" "- * it under the terms of the GNU General Public License as published by\n" @@ -271,7 +288,7 @@ "@@ -0,0 +1,28 @@\n" "+/* linux/arch/arm/mach-vt8500/dt_common.h\n" "+ *\n" - "+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>\n" + "+ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" "+ *\n" "+ * This software is licensed under the terms of the GNU General Public\n" "+ * License version 2, as published by the Free Software Foundation, and\n" @@ -305,7 +322,7 @@ "@@ -1,91 +0,0 @@\n" "-/* linux/arch/arm/mach-vt8500/devices-vt8500.c\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This software is licensed under the terms of the GNU General Public\n" "- * License version 2, as published by the Free Software Foundation, and\n" @@ -402,7 +419,7 @@ "@@ -1,99 +0,0 @@\n" "-/* linux/arch/arm/mach-vt8500/devices-wm8505.c\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This software is licensed under the terms of the GNU General Public\n" "- * License version 2, as published by the Free Software Foundation, and\n" @@ -507,7 +524,7 @@ "@@ -1,270 +0,0 @@\n" "-/* linux/arch/arm/mach-vt8500/devices.c\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This software is licensed under the terms of the GNU General Public\n" "- * License version 2, as published by the Free Software Foundation, and\n" @@ -650,7 +667,7 @@ "-\tint i;\n" "-\n" "-\tfor (i = 0; i < ARRAY_SIZE(panels); i++) {\n" - "-\t\tif (strcmp(panels[i].mode.name, str) = 0) {\n" + "-\t\tif (strcmp(panels[i].mode.name, str) == 0) {\n" "-\t\t\tcurrent_panel_idx = i;\n" "-\t\t\tbreak;\n" "-\t\t}\n" @@ -783,7 +800,7 @@ "@@ -1,88 +0,0 @@\n" "-/* linux/arch/arm/mach-vt8500/devices.h\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This software is licensed under the terms of the GNU General Public\n" "- * License version 2, as published by the Free Software Foundation, and\n" @@ -877,7 +894,7 @@ "@@ -1,240 +0,0 @@\n" "-/* linux/arch/arm/mach-vt8500/gpio.c\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This software is licensed under the terms of the GNU General Public\n" "- * License version 2, as published by the Free Software Foundation, and\n" @@ -1136,7 +1153,7 @@ "-/*\n" "- * arch/arm/mach-vt8500/include/mach/vt8500_irqs.h\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This program is free software; you can redistribute it and/or modify\n" "- * it under the terms of the GNU General Public License as published by\n" @@ -1230,7 +1247,7 @@ "-/*\n" "- * arch/arm/mach-vt8500/include/mach/vt8500_regs.h\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This program is free software; you can redistribute it and/or modify\n" "- * it under the terms of the GNU General Public License as published by\n" @@ -1315,7 +1332,7 @@ "-/*\n" "- * arch/arm/mach-vt8500/include/mach/wm8505_irqs.h\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This program is free software; you can redistribute it and/or modify\n" "- * it under the terms of the GNU General Public License as published by\n" @@ -1436,7 +1453,7 @@ "-/*\n" "- * arch/arm/mach-vt8500/include/mach/wm8505_regs.h\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This program is free software; you can redistribute it and/or modify\n" "- * it under the terms of the GNU General Public License as published by\n" @@ -1519,8 +1536,8 @@ " /*\n" " * arch/arm/mach-vt8500/irq.c\n" " *\n" - "+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>\n" - " * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "+ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" + " * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" " *\n" " * This program is free software; you can redistribute it and/or modify\n" "@@ -18,81 +19,102 @@\n" @@ -1594,7 +1611,8 @@ " {\n" "-\tvoid __iomem *base = ic_regbase;\n" "-\tunsigned irq = d->irq;\n" - "+\tstruct vt8500_irq_priv *priv +\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" + "+\tstruct vt8500_irq_priv *priv =\n" + "+\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" "+\tvoid __iomem *base = priv->base;\n" " \tu8 edge;\n" " \n" @@ -1628,7 +1646,8 @@ " {\n" "-\tvoid __iomem *base = ic_regbase;\n" "-\tunsigned irq = d->irq;\n" - "+\tstruct vt8500_irq_priv *priv +\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" + "+\tstruct vt8500_irq_priv *priv =\n" + "+\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" "+\tvoid __iomem *base = priv->base;\n" " \tu8 dctr;\n" " \n" @@ -1648,7 +1667,8 @@ "-\tvoid __iomem *base = ic_regbase;\n" "-\tunsigned irq = d->irq;\n" "-\tunsigned orig_irq = irq;\n" - "+\tstruct vt8500_irq_priv *priv +\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" + "+\tstruct vt8500_irq_priv *priv =\n" + "+\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" "+\tvoid __iomem *base = priv->base;\n" " \tu8 dctr;\n" " \n" @@ -1811,7 +1831,7 @@ "@@ -1,54 +0,0 @@\n" "-/* linux/arch/arm/mach-vt8500/restart.c\n" "- *\n" - "- * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>\n" + "- * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" "- *\n" "- * This software is licensed under the terms of the GNU General Public\n" "- * License version 2, as published by the Free Software Foundation, and\n" @@ -1872,8 +1892,8 @@ "- * arch/arm/mach-vt8500/timer.c\n" "+ * arch/arm/mach-vt8500/timer_dt.c\n" " *\n" - "+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>\n" - " * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "+ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" + " * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" " *\n" " * This program is free software; you can redistribute it and/or modify\n" "@@ -18,18 +19,25 @@\n" @@ -2014,7 +2034,7 @@ "+/*\n" "+ * arch/arm/mach-vt8500/vt8500.c\n" "+ *\n" - "+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>\n" + "+ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" "+ *\n" "+ * This program is free software; you can redistribute it and/or modify\n" "+ * it under the terms of the GNU General Public License as published by\n" @@ -2216,7 +2236,7 @@ "-/*\n" "- * arch/arm/mach-vt8500/wm8505_7in.c\n" "- *\n" - "- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>\n" + "- * Copyright (C) 2010 Alexey Charkov <alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "- *\n" "- * This program is free software; you can redistribute it and/or modify\n" "- * it under the terms of the GNU General Public License as published by\n" @@ -2295,4 +2315,4 @@ "-- \n" 1.7.9.5 -811fb182eef26e0ef1d296cf894cf66596db401df735d9dcded0e78192247956 +1e721be634647c55e72020dc6e1e4cf5d5a025b6437ec6af06589ed16f916ae9
diff --git a/a/1.txt b/N2/1.txt index 72b7593..16d26b1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -116,7 +116,7 @@ index 2c20a34..44f9f9d 100644 - well as in Eken M001 tablets and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel€0x480' to your kernel command line. Otherwise, the +- 'panel=800x480' to your kernel command line. Otherwise, the - largest one available will be used. - -config WMT_PANEL_800X600 @@ -126,7 +126,7 @@ index 2c20a34..44f9f9d 100644 - These are found in Eken M003 tablets and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel€0x600' to your kernel command line. Otherwise, the +- 'panel=800x600' to your kernel command line. Otherwise, the - largest one available will be used. - -config WMT_PANEL_1024X576 @@ -137,7 +137,7 @@ index 2c20a34..44f9f9d 100644 - These are found in CherryPal netbooks and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel\x1024x576' to your kernel command line. Otherwise, the +- 'panel=1024x576' to your kernel command line. Otherwise, the - largest one available will be used. - -config WMT_PANEL_1024X600 @@ -147,7 +147,7 @@ index 2c20a34..44f9f9d 100644 - These are found in Eken M006 tablets and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel\x1024x600' to your kernel command line. Otherwise, the +- 'panel=1024x600' to your kernel command line. Otherwise, the - largest one available will be used. + Add support for netbooks, tablets and other devices based on + the reference board design as produced by VIA/WonderMedia, using @@ -643,7 +643,7 @@ index 1fcdc36..0000000 - int i; - - for (i = 0; i < ARRAY_SIZE(panels); i++) { -- if (strcmp(panels[i].mode.name, str) = 0) { +- if (strcmp(panels[i].mode.name, str) == 0) { - current_panel_idx = i; - break; - } @@ -1587,7 +1587,8 @@ index 642de04..f8f9ab9 100644 { - void __iomem *base = ic_regbase; - unsigned irq = d->irq; -+ struct vt8500_irq_priv *priv + (struct vt8500_irq_priv *)(d->domain->host_data); ++ struct vt8500_irq_priv *priv = ++ (struct vt8500_irq_priv *)(d->domain->host_data); + void __iomem *base = priv->base; u8 edge; @@ -1621,7 +1622,8 @@ index 642de04..f8f9ab9 100644 { - void __iomem *base = ic_regbase; - unsigned irq = d->irq; -+ struct vt8500_irq_priv *priv + (struct vt8500_irq_priv *)(d->domain->host_data); ++ struct vt8500_irq_priv *priv = ++ (struct vt8500_irq_priv *)(d->domain->host_data); + void __iomem *base = priv->base; u8 dctr; @@ -1641,7 +1643,8 @@ index 642de04..f8f9ab9 100644 - void __iomem *base = ic_regbase; - unsigned irq = d->irq; - unsigned orig_irq = irq; -+ struct vt8500_irq_priv *priv + (struct vt8500_irq_priv *)(d->domain->host_data); ++ struct vt8500_irq_priv *priv = ++ (struct vt8500_irq_priv *)(d->domain->host_data); + void __iomem *base = priv->base; u8 dctr; diff --git a/a/content_digest b/N2/content_digest index faa0fab..09e9471 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01345707346-9035-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[PATCHv4 6/9] arm: vt8500: Update arch-vt8500 to devicetree support.\0" - "Date\0Thu, 23 Aug 2012 07:35:42 +0000\0" + "Date\0Thu, 23 Aug 2012 19:35:42 +1200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -123,7 +123,7 @@ "-\t well as in Eken M001 tablets and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\342\202\2540x480' to your kernel command line. Otherwise, the\n" + "-\t 'panel=800x480' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "-\n" "-config WMT_PANEL_800X600\n" @@ -133,7 +133,7 @@ "-\t These are found in Eken M003 tablets and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\342\202\2540x600' to your kernel command line. Otherwise, the\n" + "-\t 'panel=800x600' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "-\n" "-config WMT_PANEL_1024X576\n" @@ -144,7 +144,7 @@ "-\t These are found in CherryPal netbooks and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\02024x576' to your kernel command line. Otherwise, the\n" + "-\t 'panel=1024x576' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "-\n" "-config WMT_PANEL_1024X600\n" @@ -154,7 +154,7 @@ "-\t These are found in Eken M006 tablets and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\02024x600' to your kernel command line. Otherwise, the\n" + "-\t 'panel=1024x600' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "+\t Add support for netbooks, tablets and other devices based on\n" "+\t the reference board design as produced by VIA/WonderMedia, using\n" @@ -650,7 +650,7 @@ "-\tint i;\n" "-\n" "-\tfor (i = 0; i < ARRAY_SIZE(panels); i++) {\n" - "-\t\tif (strcmp(panels[i].mode.name, str) = 0) {\n" + "-\t\tif (strcmp(panels[i].mode.name, str) == 0) {\n" "-\t\t\tcurrent_panel_idx = i;\n" "-\t\t\tbreak;\n" "-\t\t}\n" @@ -1594,7 +1594,8 @@ " {\n" "-\tvoid __iomem *base = ic_regbase;\n" "-\tunsigned irq = d->irq;\n" - "+\tstruct vt8500_irq_priv *priv +\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" + "+\tstruct vt8500_irq_priv *priv =\n" + "+\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" "+\tvoid __iomem *base = priv->base;\n" " \tu8 edge;\n" " \n" @@ -1628,7 +1629,8 @@ " {\n" "-\tvoid __iomem *base = ic_regbase;\n" "-\tunsigned irq = d->irq;\n" - "+\tstruct vt8500_irq_priv *priv +\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" + "+\tstruct vt8500_irq_priv *priv =\n" + "+\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" "+\tvoid __iomem *base = priv->base;\n" " \tu8 dctr;\n" " \n" @@ -1648,7 +1650,8 @@ "-\tvoid __iomem *base = ic_regbase;\n" "-\tunsigned irq = d->irq;\n" "-\tunsigned orig_irq = irq;\n" - "+\tstruct vt8500_irq_priv *priv +\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" + "+\tstruct vt8500_irq_priv *priv =\n" + "+\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" "+\tvoid __iomem *base = priv->base;\n" " \tu8 dctr;\n" " \n" @@ -2295,4 +2298,4 @@ "-- \n" 1.7.9.5 -811fb182eef26e0ef1d296cf894cf66596db401df735d9dcded0e78192247956 +c917cd15e05952bfab7319344f247ffe3ac22bac45fd8a1fb06c3b0496cf1051
diff --git a/a/1.txt b/N3/1.txt index 72b7593..16d26b1 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -116,7 +116,7 @@ index 2c20a34..44f9f9d 100644 - well as in Eken M001 tablets and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel€0x480' to your kernel command line. Otherwise, the +- 'panel=800x480' to your kernel command line. Otherwise, the - largest one available will be used. - -config WMT_PANEL_800X600 @@ -126,7 +126,7 @@ index 2c20a34..44f9f9d 100644 - These are found in Eken M003 tablets and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel€0x600' to your kernel command line. Otherwise, the +- 'panel=800x600' to your kernel command line. Otherwise, the - largest one available will be used. - -config WMT_PANEL_1024X576 @@ -137,7 +137,7 @@ index 2c20a34..44f9f9d 100644 - These are found in CherryPal netbooks and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel\x1024x576' to your kernel command line. Otherwise, the +- 'panel=1024x576' to your kernel command line. Otherwise, the - largest one available will be used. - -config WMT_PANEL_1024X600 @@ -147,7 +147,7 @@ index 2c20a34..44f9f9d 100644 - These are found in Eken M006 tablets and possibly elsewhere. - - To select this panel at runtime, say y here and append -- 'panel\x1024x600' to your kernel command line. Otherwise, the +- 'panel=1024x600' to your kernel command line. Otherwise, the - largest one available will be used. + Add support for netbooks, tablets and other devices based on + the reference board design as produced by VIA/WonderMedia, using @@ -643,7 +643,7 @@ index 1fcdc36..0000000 - int i; - - for (i = 0; i < ARRAY_SIZE(panels); i++) { -- if (strcmp(panels[i].mode.name, str) = 0) { +- if (strcmp(panels[i].mode.name, str) == 0) { - current_panel_idx = i; - break; - } @@ -1587,7 +1587,8 @@ index 642de04..f8f9ab9 100644 { - void __iomem *base = ic_regbase; - unsigned irq = d->irq; -+ struct vt8500_irq_priv *priv + (struct vt8500_irq_priv *)(d->domain->host_data); ++ struct vt8500_irq_priv *priv = ++ (struct vt8500_irq_priv *)(d->domain->host_data); + void __iomem *base = priv->base; u8 edge; @@ -1621,7 +1622,8 @@ index 642de04..f8f9ab9 100644 { - void __iomem *base = ic_regbase; - unsigned irq = d->irq; -+ struct vt8500_irq_priv *priv + (struct vt8500_irq_priv *)(d->domain->host_data); ++ struct vt8500_irq_priv *priv = ++ (struct vt8500_irq_priv *)(d->domain->host_data); + void __iomem *base = priv->base; u8 dctr; @@ -1641,7 +1643,8 @@ index 642de04..f8f9ab9 100644 - void __iomem *base = ic_regbase; - unsigned irq = d->irq; - unsigned orig_irq = irq; -+ struct vt8500_irq_priv *priv + (struct vt8500_irq_priv *)(d->domain->host_data); ++ struct vt8500_irq_priv *priv = ++ (struct vt8500_irq_priv *)(d->domain->host_data); + void __iomem *base = priv->base; u8 dctr; diff --git a/a/content_digest b/N3/content_digest index faa0fab..0950c0e 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,8 +1,28 @@ "ref\01345707346-9035-1-git-send-email-linux@prisktech.co.nz\0" "From\0Tony Prisk <linux@prisktech.co.nz>\0" "Subject\0[PATCHv4 6/9] arm: vt8500: Update arch-vt8500 to devicetree support.\0" - "Date\0Thu, 23 Aug 2012 07:35:42 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 23 Aug 2012 19:35:42 +1200\0" + "To\0vt8500-wm8505-linux-kernel@googlegroups.com\0" + "Cc\0Tony Prisk <linux@prisktech.co.nz>" + Russell King <linux@arm.linux.org.uk> + Alessandro Zummo <a.zummo@towertech.it> + Alan Cox <alan@linux.intel.com> + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Florian Tobias Schandinat <FlorianSchandinat@gmx.de> + Arnd Bergmann <arnd@arndb.de> + Grant Likely <grant.likely@secretlab.ca> + Rob Herring <rob.herring@calxeda.com> + Rob Landley <rob@landley.net> + Linus Walleij <linus.walleij@stericsson.com> + Mike Turquette <mturquette@ti.com> + Stephen Warren <swarren@nvidia.com> + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + linux-fbdev@vger.kernel.org + linux-usb@vger.kernel.org + linux-serial@vger.kernel.org + rtc-linux@googlegroups.com + " devicetree-discuss@lists.ozlabs.org\0" "\00:1\0" "b\0" "Merged existing board files to a single dt-capable file.\n" @@ -123,7 +143,7 @@ "-\t well as in Eken M001 tablets and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\342\202\2540x480' to your kernel command line. Otherwise, the\n" + "-\t 'panel=800x480' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "-\n" "-config WMT_PANEL_800X600\n" @@ -133,7 +153,7 @@ "-\t These are found in Eken M003 tablets and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\342\202\2540x600' to your kernel command line. Otherwise, the\n" + "-\t 'panel=800x600' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "-\n" "-config WMT_PANEL_1024X576\n" @@ -144,7 +164,7 @@ "-\t These are found in CherryPal netbooks and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\02024x576' to your kernel command line. Otherwise, the\n" + "-\t 'panel=1024x576' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "-\n" "-config WMT_PANEL_1024X600\n" @@ -154,7 +174,7 @@ "-\t These are found in Eken M006 tablets and possibly elsewhere.\n" "-\n" "-\t To select this panel at runtime, say y here and append\n" - "-\t 'panel\02024x600' to your kernel command line. Otherwise, the\n" + "-\t 'panel=1024x600' to your kernel command line. Otherwise, the\n" "-\t largest one available will be used.\n" "+\t Add support for netbooks, tablets and other devices based on\n" "+\t the reference board design as produced by VIA/WonderMedia, using\n" @@ -650,7 +670,7 @@ "-\tint i;\n" "-\n" "-\tfor (i = 0; i < ARRAY_SIZE(panels); i++) {\n" - "-\t\tif (strcmp(panels[i].mode.name, str) = 0) {\n" + "-\t\tif (strcmp(panels[i].mode.name, str) == 0) {\n" "-\t\t\tcurrent_panel_idx = i;\n" "-\t\t\tbreak;\n" "-\t\t}\n" @@ -1594,7 +1614,8 @@ " {\n" "-\tvoid __iomem *base = ic_regbase;\n" "-\tunsigned irq = d->irq;\n" - "+\tstruct vt8500_irq_priv *priv +\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" + "+\tstruct vt8500_irq_priv *priv =\n" + "+\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" "+\tvoid __iomem *base = priv->base;\n" " \tu8 edge;\n" " \n" @@ -1628,7 +1649,8 @@ " {\n" "-\tvoid __iomem *base = ic_regbase;\n" "-\tunsigned irq = d->irq;\n" - "+\tstruct vt8500_irq_priv *priv +\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" + "+\tstruct vt8500_irq_priv *priv =\n" + "+\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" "+\tvoid __iomem *base = priv->base;\n" " \tu8 dctr;\n" " \n" @@ -1648,7 +1670,8 @@ "-\tvoid __iomem *base = ic_regbase;\n" "-\tunsigned irq = d->irq;\n" "-\tunsigned orig_irq = irq;\n" - "+\tstruct vt8500_irq_priv *priv +\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" + "+\tstruct vt8500_irq_priv *priv =\n" + "+\t\t\t(struct vt8500_irq_priv *)(d->domain->host_data);\n" "+\tvoid __iomem *base = priv->base;\n" " \tu8 dctr;\n" " \n" @@ -2295,4 +2318,4 @@ "-- \n" 1.7.9.5 -811fb182eef26e0ef1d296cf894cf66596db401df735d9dcded0e78192247956 +0f2da8ffbc2bbc0378c5e8daf560eecbe996cf4720f9a2961c2a4f93c5f641ea
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.