diff for duplicates of <53A559D2.1020404@kernel.org> diff --git a/a/1.txt b/N1/1.txt index c9f606e..916424b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On 13/06/14 16:21, Denis Carikli wrote: -> From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> From: Markus Pargmann <mpa@pengutronix.de> > > This is the core driver for imx25 touchscreen/adc driver. The module > has one shared ADC and two different conversion queues which use the @@ -10,12 +10,12 @@ On 13/06/14 16:21, Denis Carikli wrote: > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > the correct components. > -> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> -> Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> +> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> +> Signed-off-by: Denis Carikli <denis@eukrea.com> Hi, A couple of trivial bits inline. Otherwise, -Acked-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +Acked-by: Jonathan Cameron <jic23@kernel.org> Note I have not dived into the datasheet for this review (hence not a reviewed by!) Too many other things to do today! @@ -122,7 +122,7 @@ Note I have not dived into the datasheet for this review > +++ b/drivers/mfd/fsl-imx25-tsadc.c > @@ -0,0 +1,232 @@ > +/* -> + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License @@ -356,7 +356,7 @@ Worth checking whether this succeeded (!=NULL)? > +module_platform_driver(mx25_tsadc_driver); > + > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); -> +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); +> +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > +MODULE_ALIAS("platform:mx25-tsadc"); > diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h diff --git a/a/content_digest b/N1/content_digest index 0e41820..66d5fb8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,27 +1,26 @@ "ref\01392913312-9030-1-git-send-email-mpa@pengutronix.de\0" "ref\01402672899-6995-1-git-send-email-denis@eukrea.com\0" "ref\01402672899-6995-2-git-send-email-denis@eukrea.com\0" - "ref\01402672899-6995-2-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org\0" - "From\0Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "From\0Jonathan Cameron <jic23@kernel.org>\0" "Subject\0Re: [PATCH v2 1/6] mfd: fsl imx25 Touchscreen ADC driver\0" "Date\0Sat, 21 Jun 2014 11:09:22 +0100\0" - "To\0Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>" - Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> - " Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Cc\0Eric B\303\251nard <eric-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>" - Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org> - " Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0" + "To\0Denis Carikli <denis@eukrea.com>" + Shawn Guo <shawn.guo@linaro.org> + Samuel Ortiz <sameo@linux.intel.com> + " Dmitry Torokhov <dmitry.torokhov@gmail.com>\0" + "Cc\0Eric B\303\251nard <eric@eukrea.com>" + Sascha Hauer <kernel@pengutronix.de> + linux-arm-kernel@lists.infradead.org + Lee Jones <lee.jones@linaro.org> + linux-input@vger.kernel.org + linux-iio@vger.kernel.org + Fabio Estevam <festevam@gmail.com> + Lars-Peter Clausen <lars@metafoo.de> + " Markus Pargmann <mpa@pengutronix.de>\0" "\00:1\0" "b\0" "On 13/06/14 16:21, Denis Carikli wrote:\n" - "> From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> From: Markus Pargmann <mpa@pengutronix.de>\n" ">\n" "> This is the core driver for imx25 touchscreen/adc driver. The module\n" "> has one shared ADC and two different conversion queues which use the\n" @@ -32,12 +31,12 @@ "> registers of the TSC/ADC unit. It manages the IRQs and forwards them to\n" "> the correct components.\n" ">\n" - "> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" - "> Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>\n" + "> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>\n" + "> Signed-off-by: Denis Carikli <denis@eukrea.com>\n" "Hi,\n" "\n" "A couple of trivial bits inline. Otherwise,\n" - "Acked-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + "Acked-by: Jonathan Cameron <jic23@kernel.org>\n" "\n" "Note I have not dived into the datasheet for this review\n" "(hence not a reviewed by!) Too many other things to do today!\n" @@ -144,7 +143,7 @@ "> +++ b/drivers/mfd/fsl-imx25-tsadc.c\n" "> @@ -0,0 +1,232 @@\n" "> +/*\n" - "> + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de>\n" "> + *\n" "> + * The code contained herein is licensed under the GNU General Public\n" "> + * License. You may obtain a copy of the GNU General Public License\n" @@ -378,7 +377,7 @@ "> +module_platform_driver(mx25_tsadc_driver);\n" "> +\n" "> +MODULE_DESCRIPTION(\"MFD for ADC/TSC for Freescale mx25\");\n" - "> +MODULE_AUTHOR(\"Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\");\n" + "> +MODULE_AUTHOR(\"Markus Pargmann <mpa@pengutronix.de>\");\n" "> +MODULE_LICENSE(\"GPL v2\");\n" "> +MODULE_ALIAS(\"platform:mx25-tsadc\");\n" "> diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h\n" @@ -527,4 +526,4 @@ "> +#endif /* _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ */\n" > -9907c5d5c09ff9897dba45e4b95050ff8ba5ce832627177c7a1c8ca6df6d16ab +753638df5f9038b4f0e3622466a7646b56fc3bbd8f6f94daa244c7b3f0d881ec
diff --git a/a/1.txt b/N2/1.txt index c9f606e..f900cfc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,5 +1,5 @@ On 13/06/14 16:21, Denis Carikli wrote: -> From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> From: Markus Pargmann <mpa@pengutronix.de> > > This is the core driver for imx25 touchscreen/adc driver. The module > has one shared ADC and two different conversion queues which use the @@ -10,12 +10,12 @@ On 13/06/14 16:21, Denis Carikli wrote: > registers of the TSC/ADC unit. It manages the IRQs and forwards them to > the correct components. > -> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> -> Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> +> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> +> Signed-off-by: Denis Carikli <denis@eukrea.com> Hi, A couple of trivial bits inline. Otherwise, -Acked-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +Acked-by: Jonathan Cameron <jic23@kernel.org> Note I have not dived into the datasheet for this review (hence not a reviewed by!) Too many other things to do today! @@ -58,7 +58,7 @@ Note I have not dived into the datasheet for this review > +The first queue is for the touchscreen, the second for general purpose ADC. > + > +Example: -> + tscadc: tscadc@50030000 { +> + tscadc: tscadc at 50030000 { > + compatible = "fsl,imx25-tsadc"; > + reg = <0x50030000 0xc>; > + interrupts = <46>; @@ -70,13 +70,13 @@ Note I have not dived into the datasheet for this review > + #size-cells = <1>; > + ranges; > + -> + tsc: tcq@50030400 { +> + tsc: tcq at 50030400 { > + compatible = "fsl,imx25-tcq"; > + reg = <0x50030400 0x60>; > + ... > + }; > + -> + adc: gcq@50030800 { +> + adc: gcq at 50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + ... @@ -122,7 +122,7 @@ Note I have not dived into the datasheet for this review > +++ b/drivers/mfd/fsl-imx25-tsadc.c > @@ -0,0 +1,232 @@ > +/* -> + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License @@ -356,7 +356,7 @@ Worth checking whether this succeeded (!=NULL)? > +module_platform_driver(mx25_tsadc_driver); > + > +MODULE_DESCRIPTION("MFD for ADC/TSC for Freescale mx25"); -> +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); +> +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > +MODULE_ALIAS("platform:mx25-tsadc"); > diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h diff --git a/a/content_digest b/N2/content_digest index 0e41820..9cd8044 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,14 @@ "ref\01392913312-9030-1-git-send-email-mpa@pengutronix.de\0" "ref\01402672899-6995-1-git-send-email-denis@eukrea.com\0" "ref\01402672899-6995-2-git-send-email-denis@eukrea.com\0" - "ref\01402672899-6995-2-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org\0" - "From\0Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" - "Subject\0Re: [PATCH v2 1/6] mfd: fsl imx25 Touchscreen ADC driver\0" + "From\0jic23@kernel.org (Jonathan Cameron)\0" + "Subject\0[PATCH v2 1/6] mfd: fsl imx25 Touchscreen ADC driver\0" "Date\0Sat, 21 Jun 2014 11:09:22 +0100\0" - "To\0Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>" - Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> - " Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Cc\0Eric B\303\251nard <eric-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>" - Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org> - " Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 13/06/14 16:21, Denis Carikli wrote:\n" - "> From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> From: Markus Pargmann <mpa@pengutronix.de>\n" ">\n" "> This is the core driver for imx25 touchscreen/adc driver. The module\n" "> has one shared ADC and two different conversion queues which use the\n" @@ -32,12 +19,12 @@ "> registers of the TSC/ADC unit. It manages the IRQs and forwards them to\n" "> the correct components.\n" ">\n" - "> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" - "> Signed-off-by: Denis Carikli <denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org>\n" + "> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>\n" + "> Signed-off-by: Denis Carikli <denis@eukrea.com>\n" "Hi,\n" "\n" "A couple of trivial bits inline. Otherwise,\n" - "Acked-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + "Acked-by: Jonathan Cameron <jic23@kernel.org>\n" "\n" "Note I have not dived into the datasheet for this review\n" "(hence not a reviewed by!) Too many other things to do today!\n" @@ -80,7 +67,7 @@ "> +The first queue is for the touchscreen, the second for general purpose ADC.\n" "> +\n" "> +Example:\n" - "> +\ttscadc: tscadc@50030000 {\n" + "> +\ttscadc: tscadc at 50030000 {\n" "> +\t\tcompatible = \"fsl,imx25-tsadc\";\n" "> +\t\treg = <0x50030000 0xc>;\n" "> +\t\tinterrupts = <46>;\n" @@ -92,13 +79,13 @@ "> +\t\t#size-cells = <1>;\n" "> +\t\tranges;\n" "> +\n" - "> +\t\ttsc: tcq@50030400 {\n" + "> +\t\ttsc: tcq at 50030400 {\n" "> +\t\t\tcompatible = \"fsl,imx25-tcq\";\n" "> +\t\t\treg = <0x50030400 0x60>;\n" "> +\t\t\t...\n" "> +\t\t};\n" "> +\n" - "> +\t\tadc: gcq@50030800 {\n" + "> +\t\tadc: gcq at 50030800 {\n" "> +\t\t\tcompatible = \"fsl,imx25-gcq\";\n" "> +\t\t\treg = <0x50030800 0x60>;\n" "> +\t\t\t...\n" @@ -144,7 +131,7 @@ "> +++ b/drivers/mfd/fsl-imx25-tsadc.c\n" "> @@ -0,0 +1,232 @@\n" "> +/*\n" - "> + * Copyright 2014 Markus Pargmann, Pengutronix <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> + * Copyright 2014 Markus Pargmann, Pengutronix <mpa@pengutronix.de>\n" "> + *\n" "> + * The code contained herein is licensed under the GNU General Public\n" "> + * License. You may obtain a copy of the GNU General Public License\n" @@ -378,7 +365,7 @@ "> +module_platform_driver(mx25_tsadc_driver);\n" "> +\n" "> +MODULE_DESCRIPTION(\"MFD for ADC/TSC for Freescale mx25\");\n" - "> +MODULE_AUTHOR(\"Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\");\n" + "> +MODULE_AUTHOR(\"Markus Pargmann <mpa@pengutronix.de>\");\n" "> +MODULE_LICENSE(\"GPL v2\");\n" "> +MODULE_ALIAS(\"platform:mx25-tsadc\");\n" "> diff --git a/include/linux/mfd/imx25-tsadc.h b/include/linux/mfd/imx25-tsadc.h\n" @@ -527,4 +514,4 @@ "> +#endif /* _LINUX_INCLUDE_INPUT_IMX25_TSADC_H_ */\n" > -9907c5d5c09ff9897dba45e4b95050ff8ba5ce832627177c7a1c8ca6df6d16ab +d3ec8d1618d819282acf8f31f233820fbe898dd5810d152927b8dd95e1e08347
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.