diff for duplicates of <1345707346-9035-9-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index 773d4c9..6dba12e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ Added support for WM8505 and WM8650 GPIO controllers. Replaced existing readl/writel calls with _relaxed variants. Replaced existing unsigned variables with u32 to match register size. -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 + @@ -48,9 +48,9 @@ index 0000000..bcd8e4a @@ -0,0 +1,316 @@ +/* drivers/gpio/gpio-vt8500.c + * -+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz> ++ * Copyright (C) 2012 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> + * Based on 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 @@ -181,7 +181,7 @@ index 0000000..bcd8e4a + u32 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_relaxed(vt8500_chip->base + vt8500_chip->regs->en); @@ -196,7 +196,7 @@ index 0000000..bcd8e4a + struct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip); + u32 val; + -+ if (vt8500_chip->regs->en = NO_REG) ++ if (vt8500_chip->regs->en == NO_REG) + return; + + val = readl_relaxed(vt8500_chip->base + vt8500_chip->regs->en); @@ -321,7 +321,8 @@ index 0000000..bcd8e4a +{ + 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"); @@ -358,8 +359,13 @@ index 0000000..bcd8e4a +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); -- 1.7.9.5 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-usb" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 86a9a66..e0a6ea6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,29 @@ "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 8/9] arm: vt8500: gpio: Devicetree support for arch-vt8500\0" - "Date\0Thu, 23 Aug 2012 07:35:44 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 23 Aug 2012 19:35:44 +1200\0" + "To\0vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" + "Cc\0Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>" + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + Alessandro Zummo <a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org> + Alan Cox <alan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> + Florian Tobias Schandinat <FlorianSchandinat-Mmb7MZpHnFY@public.gmane.org> + Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> + Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> + Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> + Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org> + Linus Walleij <linus.walleij-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> + Mike Turquette <mturquette-l0cyMroinI0@public.gmane.org> + Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" "\00:1\0" "b\0" "Converted the existing arch-vt8500 gpio to a platform_device.\n" @@ -10,7 +31,7 @@ "Replaced existing readl/writel calls with _relaxed variants.\n" "Replaced existing unsigned variables with u32 to match register size.\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" @@ -55,9 +76,9 @@ "@@ -0,0 +1,316 @@\n" "+/* drivers/gpio/gpio-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" "+ * Based on arch/arm/mach-vt8500/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" @@ -188,7 +209,7 @@ "+\tu32 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_relaxed(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -203,7 +224,7 @@ "+\tstruct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip);\n" "+\tu32 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_relaxed(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -328,7 +349,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" @@ -365,10 +387,15 @@ "+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 + "1.7.9.5\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-usb\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -bfc6f51db02aca66c51749d079d0cdcf2472669e0aa9163852c9e64e3b229da1 +d75840ae02cfc3c889c47a0f0737692f2c735ddeb08b3093b22e330fee05b02a
diff --git a/a/1.txt b/N2/1.txt index 773d4c9..8475aa1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -181,7 +181,7 @@ index 0000000..bcd8e4a + u32 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_relaxed(vt8500_chip->base + vt8500_chip->regs->en); @@ -196,7 +196,7 @@ index 0000000..bcd8e4a + struct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip); + u32 val; + -+ if (vt8500_chip->regs->en = NO_REG) ++ if (vt8500_chip->regs->en == NO_REG) + return; + + val = readl_relaxed(vt8500_chip->base + vt8500_chip->regs->en); @@ -321,7 +321,8 @@ index 0000000..bcd8e4a +{ + 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 86a9a66..b2fb035 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 8/9] arm: vt8500: gpio: Devicetree support for arch-vt8500\0" - "Date\0Thu, 23 Aug 2012 07:35:44 +0000\0" + "Date\0Thu, 23 Aug 2012 19:35:44 +1200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -188,7 +188,7 @@ "+\tu32 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_relaxed(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -203,7 +203,7 @@ "+\tstruct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip);\n" "+\tu32 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_relaxed(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -328,7 +328,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" @@ -371,4 +372,4 @@ "-- \n" 1.7.9.5 -bfc6f51db02aca66c51749d079d0cdcf2472669e0aa9163852c9e64e3b229da1 +f205f93d7d14a004f1549ab3e7dfd31d3b26b20ec477a85d3a5be03ec8ff4419
diff --git a/a/1.txt b/N3/1.txt index 773d4c9..8475aa1 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -181,7 +181,7 @@ index 0000000..bcd8e4a + u32 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_relaxed(vt8500_chip->base + vt8500_chip->regs->en); @@ -196,7 +196,7 @@ index 0000000..bcd8e4a + struct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip); + u32 val; + -+ if (vt8500_chip->regs->en = NO_REG) ++ if (vt8500_chip->regs->en == NO_REG) + return; + + val = readl_relaxed(vt8500_chip->base + vt8500_chip->regs->en); @@ -321,7 +321,8 @@ index 0000000..bcd8e4a +{ + 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 86a9a66..1603c07 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 8/9] arm: vt8500: gpio: Devicetree support for arch-vt8500\0" - "Date\0Thu, 23 Aug 2012 07:35:44 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 23 Aug 2012 19:35:44 +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" "Converted the existing arch-vt8500 gpio to a platform_device.\n" @@ -188,7 +208,7 @@ "+\tu32 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_relaxed(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -203,7 +223,7 @@ "+\tstruct vt8500_gpio_chip *vt8500_chip = to_vt8500(chip);\n" "+\tu32 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_relaxed(vt8500_chip->base + vt8500_chip->regs->en);\n" @@ -328,7 +348,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" @@ -371,4 +392,4 @@ "-- \n" 1.7.9.5 -bfc6f51db02aca66c51749d079d0cdcf2472669e0aa9163852c9e64e3b229da1 +207ebfec591f3f9506231c481ca9a0b94cd0d8e60cced0992a932ec96c9d2c1f
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.