diff for duplicates of <53AFF963.20604@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 802f03c..7e47ef5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On 24/06/14 15:46, Denis Carikli wrote: -> From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> From: Markus Pargmann <mpa@pengutronix.de> > > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver @@ -11,8 +11,8 @@ On 24/06/14 15:46, Denis Carikli wrote: > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. > -> 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> Locking issue in read_raw and trivial other stuff. > --- @@ -140,7 +140,7 @@ Locking issue in read_raw and trivial other stuff. > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,371 @@ > +/* -> + * 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 @@ -513,7 +513,7 @@ Multiline comment syntax. > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); -> +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); +> +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > diff --git a/include/dt-bindings/iio/adc/fsl-imx25-gcq.h b/include/dt-bindings/iio/adc/fsl-imx25-gcq.h > new file mode 100644 diff --git a/a/content_digest b/N1/content_digest index f1f57d5..337116d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,34 +1,33 @@ "ref\01403621195-9622-1-git-send-email-denis@eukrea.com\0" "ref\01403621195-9622-3-git-send-email-denis@eukrea.com\0" - "ref\01403621195-9622-3-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 v4 3/6] iio: adc: fsl,imx25-gcq driver\0" "Date\0Sun, 29 Jun 2014 12:32:51 +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> - Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Peter Meerwald <pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org> - " Hartmut Knaack <knaack.h-Mmb7MZpHnFY@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 - Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org> - Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> - Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> - Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> - " Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@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> + Fabio Estevam <festevam@gmail.com> + Peter Meerwald <pmeerw@pmeerw.net> + " Hartmut Knaack <knaack.h@gmx.de>\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 + Lars-Peter Clausen <lars@metafoo.de> + Markus Pargmann <mpa@pengutronix.de> + devicetree@vger.kernel.org + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + " Kumar Gala <galak@codeaurora.org>\0" "\00:1\0" "b\0" "On 24/06/14 15:46, Denis Carikli wrote:\n" - "> From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> From: Markus Pargmann <mpa@pengutronix.de>\n" ">\n" "> This is a conversion queue driver for the mx25 SoC. It uses the central\n" "> ADC which is used by two seperate independent queues. This driver\n" @@ -40,8 +39,8 @@ "> The reference voltages are configurable through devicetree subnodes,\n" "> depending on the connections of the ADC inputs.\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" "Locking issue in read_raw and trivial other stuff.\n" "\n" "> ---\n" @@ -169,7 +168,7 @@ "> +++ b/drivers/iio/adc/fsl-imx25-gcq.c\n" "> @@ -0,0 +1,371 @@\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" @@ -542,7 +541,7 @@ "> +module_platform_driver(mx25_gcq_driver);\n" "> +\n" "> +MODULE_DESCRIPTION(\"ADC driver 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" "> diff --git a/include/dt-bindings/iio/adc/fsl-imx25-gcq.h b/include/dt-bindings/iio/adc/fsl-imx25-gcq.h\n" "> new file mode 100644\n" @@ -563,4 +562,4 @@ "> +#endif\n" > -e375be1ab08eba14650f4907222b6a8468e0a4785e46005a915c5a1899016bd9 +2d29e90e14a48ba062c2fbcbcf5f460b79f6ee24c709e364b2b0128dbf0179f7
diff --git a/a/1.txt b/N2/1.txt index 802f03c..ffe2567 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,5 +1,5 @@ On 24/06/14 15:46, Denis Carikli wrote: -> From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> From: Markus Pargmann <mpa@pengutronix.de> > > This is a conversion queue driver for the mx25 SoC. It uses the central > ADC which is used by two seperate independent queues. This driver @@ -11,8 +11,8 @@ On 24/06/14 15:46, Denis Carikli wrote: > The reference voltages are configurable through devicetree subnodes, > depending on the connections of the ADC inputs. > -> 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> Locking issue in read_raw and trivial other stuff. > --- @@ -90,7 +90,7 @@ Locking issue in read_raw and trivial other stuff. > + > +Example: > + -> + adc: adc@50030800 { +> + adc: adc at 50030800 { > + compatible = "fsl,imx25-gcq"; > + reg = <0x50030800 0x60>; > + interrupt-parent = <&tscadc>; @@ -98,7 +98,7 @@ Locking issue in read_raw and trivial other stuff. > + #address-cells = <1>; > + #size-cells = <0>; > + -> + inaux@5 { +> + inaux at 5 { > + reg = <5>; > + fsl,adc-ref = <MX25_ADC_REF_INT>; > + }; @@ -140,7 +140,7 @@ Locking issue in read_raw and trivial other stuff. > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -0,0 +1,371 @@ > +/* -> + * 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 @@ -513,7 +513,7 @@ Multiline comment syntax. > +module_platform_driver(mx25_gcq_driver); > + > +MODULE_DESCRIPTION("ADC driver for Freescale mx25"); -> +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); +> +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > diff --git a/include/dt-bindings/iio/adc/fsl-imx25-gcq.h b/include/dt-bindings/iio/adc/fsl-imx25-gcq.h > new file mode 100644 diff --git a/a/content_digest b/N2/content_digest index f1f57d5..600d49d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,34 +1,13 @@ "ref\01403621195-9622-1-git-send-email-denis@eukrea.com\0" "ref\01403621195-9622-3-git-send-email-denis@eukrea.com\0" - "ref\01403621195-9622-3-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org\0" - "From\0Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" - "Subject\0Re: [PATCH v4 3/6] iio: adc: fsl,imx25-gcq driver\0" + "From\0jic23@kernel.org (Jonathan Cameron)\0" + "Subject\0[PATCH v4 3/6] iio: adc: fsl,imx25-gcq driver\0" "Date\0Sun, 29 Jun 2014 12:32:51 +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> - Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Peter Meerwald <pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org> - " Hartmut Knaack <knaack.h-Mmb7MZpHnFY@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 - Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org> - Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> - Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> - Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> - " Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 24/06/14 15:46, Denis Carikli wrote:\n" - "> From: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> From: Markus Pargmann <mpa@pengutronix.de>\n" ">\n" "> This is a conversion queue driver for the mx25 SoC. It uses the central\n" "> ADC which is used by two seperate independent queues. This driver\n" @@ -40,8 +19,8 @@ "> The reference voltages are configurable through devicetree subnodes,\n" "> depending on the connections of the ADC inputs.\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" "Locking issue in read_raw and trivial other stuff.\n" "\n" "> ---\n" @@ -119,7 +98,7 @@ "> +\n" "> +Example:\n" "> +\n" - "> +\tadc: adc@50030800 {\n" + "> +\tadc: adc at 50030800 {\n" "> +\t\tcompatible = \"fsl,imx25-gcq\";\n" "> +\t\treg = <0x50030800 0x60>;\n" "> +\t\tinterrupt-parent = <&tscadc>;\n" @@ -127,7 +106,7 @@ "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\tinaux@5 {\n" + "> +\t\tinaux at 5 {\n" "> +\t\t\treg = <5>;\n" "> +\t\t\tfsl,adc-ref = <MX25_ADC_REF_INT>;\n" "> +\t\t};\n" @@ -169,7 +148,7 @@ "> +++ b/drivers/iio/adc/fsl-imx25-gcq.c\n" "> @@ -0,0 +1,371 @@\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" @@ -542,7 +521,7 @@ "> +module_platform_driver(mx25_gcq_driver);\n" "> +\n" "> +MODULE_DESCRIPTION(\"ADC driver 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" "> diff --git a/include/dt-bindings/iio/adc/fsl-imx25-gcq.h b/include/dt-bindings/iio/adc/fsl-imx25-gcq.h\n" "> new file mode 100644\n" @@ -563,4 +542,4 @@ "> +#endif\n" > -e375be1ab08eba14650f4907222b6a8468e0a4785e46005a915c5a1899016bd9 +c6ab3ffdbf98871b7aa2c17bb84768d3300a1574888ab54c9b469755ef730e86
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.