diff for duplicates of <1345582058-2291-9-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index a0e680a..0b6113b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ Converted the existing arch-vt8500 gpio to a platform_device. Added support for WM8505 and WM8650 GPIO controllers. -Signed-off-by: Tony Prisk <linux@prisktech.co.nz> +Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> --- drivers/gpio/Kconfig | 6 + drivers/gpio/Makefile | 1 + @@ -46,9 +46,9 @@ index 0000000..19b12d9 @@ -0,0 +1,313 @@ +/* linux/arch/arm/mach-vt8500/gpio.c + * -+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> ++ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> + * Based on 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 @@ -179,7 +179,7 @@ index 0000000..19b12d9 + unsigned val; + struct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip); + -+ if (vt8500_chip->regs->en = NO_REG) ++ if (vt8500_chip->regs->en == NO_REG) + return 0; + + val = readl(vt8500_chip->base + vt8500_chip->regs->en); @@ -194,7 +194,7 @@ index 0000000..19b12d9 + struct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip); + unsigned val; + -+ if (vt8500_chip->regs->en = NO_REG) ++ if (vt8500_chip->regs->en == NO_REG) + return; + + val = readl(vt8500_chip->base + vt8500_chip->regs->en); @@ -316,7 +316,8 @@ index 0000000..19b12d9 +{ + void __iomem *gpio_base; + struct device_node *np; -+ const struct of_device_id *of_id + of_match_device(vt8500_gpio_dt_ids, &pdev->dev); ++ const struct of_device_id *of_id = ++ of_match_device(vt8500_gpio_dt_ids, &pdev->dev); + + if (!of_id) { + dev_err(&pdev->dev, "Failed to find gpio controller\n"); @@ -353,7 +354,7 @@ index 0000000..19b12d9 +module_platform_driver(vt8500_gpio_driver); + +MODULE_DESCRIPTION("VT8500 GPIO Driver"); -+MODULE_AUTHOR("Tony Prisk <linux@prisktech.co.nz>"); ++MODULE_AUTHOR("Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>"); +MODULE_LICENSE("GPL v2"); +MODULE_DEVICE_TABLE(of, vt8500_gpio_dt_ids); -- diff --git a/a/content_digest b/N1/content_digest index b14b9b3..052bd85 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,31 @@ "ref\01345582058-2291-1-git-send-email-linux@prisktech.co.nz\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "ref\01345582058-2291-1-git-send-email-linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org\0" + "From\0Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\0" "Subject\0[PATCHv3 8/9] arm: vt8500: gpio: Devicetree support for arch-vt8500\0" - "Date\0Tue, 21 Aug 2012 20:47:37 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 22 Aug 2012 08:47:37 +1200\0" + "To\0vt8500-wm8505-linux-kernel-/JYPxA39Uh6Zox4op4iWzw@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" "Converted the existing arch-vt8500 gpio to a platform_device.\n" "Added support for WM8505 and WM8650 GPIO controllers.\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" " drivers/gpio/Kconfig | 6 +\n" " drivers/gpio/Makefile | 1 +\n" @@ -53,9 +70,9 @@ "@@ -0,0 +1,313 @@\n" "+/* linux/arch/arm/mach-vt8500/gpio.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" "+ * Based on gpio.c:\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" @@ -186,7 +203,7 @@ "+\tunsigned val;\n" "+\tstruct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip);\n" "+\n" - "+\tif (vt8500_chip->regs->en = NO_REG)\n" + "+\tif (vt8500_chip->regs->en == NO_REG)\n" "+\t\treturn 0;\n" "+\n" "+\tval = readl(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -201,7 +218,7 @@ "+\tstruct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip);\n" "+\tunsigned val;\n" "+\n" - "+\tif (vt8500_chip->regs->en = NO_REG)\n" + "+\tif (vt8500_chip->regs->en == NO_REG)\n" "+\t\treturn;\n" "+\n" "+\tval = readl(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -323,7 +340,8 @@ "+{\n" "+\tvoid __iomem *gpio_base;\n" "+\tstruct device_node *np;\n" - "+\tconst struct of_device_id *of_id +\t\t\t\tof_match_device(vt8500_gpio_dt_ids, &pdev->dev);\n" + "+\tconst struct of_device_id *of_id =\n" + "+\t\t\t\tof_match_device(vt8500_gpio_dt_ids, &pdev->dev);\n" "+\n" "+\tif (!of_id) {\n" "+\t\tdev_err(&pdev->dev, \"Failed to find gpio controller\\n\");\n" @@ -360,10 +378,10 @@ "+module_platform_driver(vt8500_gpio_driver);\n" "+\n" "+MODULE_DESCRIPTION(\"VT8500 GPIO Driver\");\n" - "+MODULE_AUTHOR(\"Tony Prisk <linux@prisktech.co.nz>\");\n" + "+MODULE_AUTHOR(\"Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\");\n" "+MODULE_LICENSE(\"GPL v2\");\n" "+MODULE_DEVICE_TABLE(of, vt8500_gpio_dt_ids);\n" "-- \n" 1.7.9.5 -90be0277bcfd4d0ee586497557a31f0bf329f5ab54fb2de70c81c111ebf2d4a1 +790b128dcebda3903b91ab5e02af5e780a49de03d96d768368da59cd8653503c
diff --git a/a/1.txt b/N2/1.txt index a0e680a..54383d6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -179,7 +179,7 @@ index 0000000..19b12d9 + unsigned val; + struct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip); + -+ if (vt8500_chip->regs->en = NO_REG) ++ if (vt8500_chip->regs->en == NO_REG) + return 0; + + val = readl(vt8500_chip->base + vt8500_chip->regs->en); @@ -194,7 +194,7 @@ index 0000000..19b12d9 + struct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip); + unsigned val; + -+ if (vt8500_chip->regs->en = NO_REG) ++ if (vt8500_chip->regs->en == NO_REG) + return; + + val = readl(vt8500_chip->base + vt8500_chip->regs->en); @@ -316,7 +316,8 @@ index 0000000..19b12d9 +{ + void __iomem *gpio_base; + struct device_node *np; -+ const struct of_device_id *of_id + of_match_device(vt8500_gpio_dt_ids, &pdev->dev); ++ const struct of_device_id *of_id = ++ of_match_device(vt8500_gpio_dt_ids, &pdev->dev); + + if (!of_id) { + dev_err(&pdev->dev, "Failed to find gpio controller\n"); diff --git a/a/content_digest b/N2/content_digest index b14b9b3..4c9865d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01345582058-2291-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[PATCHv3 8/9] arm: vt8500: gpio: Devicetree support for arch-vt8500\0" - "Date\0Tue, 21 Aug 2012 20:47:37 +0000\0" + "Date\0Wed, 22 Aug 2012 08:47:37 +1200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -186,7 +186,7 @@ "+\tunsigned val;\n" "+\tstruct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip);\n" "+\n" - "+\tif (vt8500_chip->regs->en = NO_REG)\n" + "+\tif (vt8500_chip->regs->en == NO_REG)\n" "+\t\treturn 0;\n" "+\n" "+\tval = readl(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -201,7 +201,7 @@ "+\tstruct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip);\n" "+\tunsigned val;\n" "+\n" - "+\tif (vt8500_chip->regs->en = NO_REG)\n" + "+\tif (vt8500_chip->regs->en == NO_REG)\n" "+\t\treturn;\n" "+\n" "+\tval = readl(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -323,7 +323,8 @@ "+{\n" "+\tvoid __iomem *gpio_base;\n" "+\tstruct device_node *np;\n" - "+\tconst struct of_device_id *of_id +\t\t\t\tof_match_device(vt8500_gpio_dt_ids, &pdev->dev);\n" + "+\tconst struct of_device_id *of_id =\n" + "+\t\t\t\tof_match_device(vt8500_gpio_dt_ids, &pdev->dev);\n" "+\n" "+\tif (!of_id) {\n" "+\t\tdev_err(&pdev->dev, \"Failed to find gpio controller\\n\");\n" @@ -366,4 +367,4 @@ "-- \n" 1.7.9.5 -90be0277bcfd4d0ee586497557a31f0bf329f5ab54fb2de70c81c111ebf2d4a1 +a241fe1c0c8458a96ecc30b121b5c9b9c97e679e52e4c74aae6ab7c6e68812fa
diff --git a/a/1.txt b/N3/1.txt index a0e680a..54383d6 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -179,7 +179,7 @@ index 0000000..19b12d9 + unsigned val; + struct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip); + -+ if (vt8500_chip->regs->en = NO_REG) ++ if (vt8500_chip->regs->en == NO_REG) + return 0; + + val = readl(vt8500_chip->base + vt8500_chip->regs->en); @@ -194,7 +194,7 @@ index 0000000..19b12d9 + struct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip); + unsigned val; + -+ if (vt8500_chip->regs->en = NO_REG) ++ if (vt8500_chip->regs->en == NO_REG) + return; + + val = readl(vt8500_chip->base + vt8500_chip->regs->en); @@ -316,7 +316,8 @@ index 0000000..19b12d9 +{ + void __iomem *gpio_base; + struct device_node *np; -+ const struct of_device_id *of_id + of_match_device(vt8500_gpio_dt_ids, &pdev->dev); ++ const struct of_device_id *of_id = ++ of_match_device(vt8500_gpio_dt_ids, &pdev->dev); + + if (!of_id) { + dev_err(&pdev->dev, "Failed to find gpio controller\n"); diff --git a/a/content_digest b/N3/content_digest index b14b9b3..85b87a6 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,8 +1,28 @@ "ref\01345582058-2291-1-git-send-email-linux@prisktech.co.nz\0" "From\0Tony Prisk <linux@prisktech.co.nz>\0" "Subject\0[PATCHv3 8/9] arm: vt8500: gpio: Devicetree support for arch-vt8500\0" - "Date\0Tue, 21 Aug 2012 20:47:37 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 22 Aug 2012 08:47:37 +1200\0" + "To\0vt8500-wm8505-linux-kernel@googlegroup.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" "Converted the existing arch-vt8500 gpio to a platform_device.\n" @@ -186,7 +206,7 @@ "+\tunsigned val;\n" "+\tstruct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip);\n" "+\n" - "+\tif (vt8500_chip->regs->en = NO_REG)\n" + "+\tif (vt8500_chip->regs->en == NO_REG)\n" "+\t\treturn 0;\n" "+\n" "+\tval = readl(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -201,7 +221,7 @@ "+\tstruct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip);\n" "+\tunsigned val;\n" "+\n" - "+\tif (vt8500_chip->regs->en = NO_REG)\n" + "+\tif (vt8500_chip->regs->en == NO_REG)\n" "+\t\treturn;\n" "+\n" "+\tval = readl(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -323,7 +343,8 @@ "+{\n" "+\tvoid __iomem *gpio_base;\n" "+\tstruct device_node *np;\n" - "+\tconst struct of_device_id *of_id +\t\t\t\tof_match_device(vt8500_gpio_dt_ids, &pdev->dev);\n" + "+\tconst struct of_device_id *of_id =\n" + "+\t\t\t\tof_match_device(vt8500_gpio_dt_ids, &pdev->dev);\n" "+\n" "+\tif (!of_id) {\n" "+\t\tdev_err(&pdev->dev, \"Failed to find gpio controller\\n\");\n" @@ -366,4 +387,4 @@ "-- \n" 1.7.9.5 -90be0277bcfd4d0ee586497557a31f0bf329f5ab54fb2de70c81c111ebf2d4a1 +8e724cbf04621f4de43ad84341e153ee2bd261930290c4ff69891b18d8f0a285
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.