diff for duplicates of <566C4AFC.9060500@kernel.org> diff --git a/a/1.txt b/N1/1.txt index fd52a27..eada051 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ Jonathan > reg = <0x30400000 0x400000>; > ranges; > -> + adc1: adc@30610000 { +> + adc1: adc at 30610000 { > + compatible = "fsl,imx7d-adc"; > + reg = <0x30610000 0x10000>; > + interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; @@ -28,7 +28,7 @@ Jonathan > + status = "disabled"; > + }; > + -> + adc2: adc@30620000 { +> + adc2: adc at 30620000 { > + compatible = "fsl,imx7d-adc"; > + reg = <0x30620000 0x10000>; > + interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; @@ -37,7 +37,7 @@ Jonathan > + status = "disabled"; > + }; > + -> pwm1: pwm@30660000 { +> pwm1: pwm at 30660000 { > compatible = "fsl,imx7d-pwm", "fsl,imx27-pwm"; > reg = <0x30660000 0x10000>; > diff --git a/a/content_digest b/N1/content_digest index 5d3266a..f5c4e7b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,9 @@ "ref\01449570383-25716-1-git-send-email-haibo.chen@freescale.com\0" "ref\01449570383-25716-4-git-send-email-haibo.chen@freescale.com\0" - "From\0Jonathan Cameron <jic23@kernel.org>\0" - "Subject\0Re: [PATCH v5 3/4] ARM: dts: imx7d.dtsi: add ADC support\0" + "From\0jic23@kernel.org (Jonathan Cameron)\0" + "Subject\0[PATCH v5 3/4] ARM: dts: imx7d.dtsi: add ADC support\0" "Date\0Sat, 12 Dec 2015 16:27:40 +0000\0" - "To\0Haibo Chen <haibo.chen@freescale.com>" - knaack.h@gmx.de - lars@metafoo.de - pmeerw@pmeerw.net - shawnguo@kernel.org - " kernel@pengutronix.de\0" - "Cc\0linux-iio@vger.kernel.org" - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 08/12/15 10:26, Haibo Chen wrote:\n" @@ -36,7 +27,7 @@ "> \t\t\treg = <0x30400000 0x400000>;\n" "> \t\t\tranges;\n" "> \n" - "> +\t\t\tadc1: adc@30610000 {\n" + "> +\t\t\tadc1: adc at 30610000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx7d-adc\";\n" "> +\t\t\t\treg = <0x30610000 0x10000>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -45,7 +36,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tadc2: adc@30620000 {\n" + "> +\t\t\tadc2: adc at 30620000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx7d-adc\";\n" "> +\t\t\t\treg = <0x30620000 0x10000>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -54,9 +45,9 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tpwm1: pwm@30660000 {\n" + "> \t\t\tpwm1: pwm at 30660000 {\n" "> \t\t\t\tcompatible = \"fsl,imx7d-pwm\", \"fsl,imx27-pwm\";\n" "> \t\t\t\treg = <0x30660000 0x10000>;\n" > -14d83f77aa6c3810072792835cee9a0a5c3cc17812d067c03cc5ef936bfe2999 +52de544d23db35b2fb2e7e158766b632400f7fafdde2af9e006f1dca004adafa
diff --git a/a/1.txt b/N2/1.txt index fd52a27..774227b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,7 +1,7 @@ On 08/12/15 10:26, Haibo Chen wrote: > Add imx7d ADC support. > -> Signed-off-by: Haibo Chen <haibo.chen@freescale.com> +> Signed-off-by: Haibo Chen <haibo.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org> The driver is now working its way in the direction of linux-next via Greg KHs tree. I'm happy to take these changes as well, but would imagine they are better routed through the relevant imx trees. diff --git a/a/content_digest b/N2/content_digest index 5d3266a..73c973d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,24 +1,25 @@ "ref\01449570383-25716-1-git-send-email-haibo.chen@freescale.com\0" "ref\01449570383-25716-4-git-send-email-haibo.chen@freescale.com\0" - "From\0Jonathan Cameron <jic23@kernel.org>\0" + "ref\01449570383-25716-4-git-send-email-haibo.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0" + "From\0Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCH v5 3/4] ARM: dts: imx7d.dtsi: add ADC support\0" "Date\0Sat, 12 Dec 2015 16:27:40 +0000\0" - "To\0Haibo Chen <haibo.chen@freescale.com>" - knaack.h@gmx.de - lars@metafoo.de - pmeerw@pmeerw.net - shawnguo@kernel.org - " kernel@pengutronix.de\0" - "Cc\0linux-iio@vger.kernel.org" - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0Haibo Chen <haibo.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>" + knaack.h-Mmb7MZpHnFY@public.gmane.org + lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org + pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org + shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + " kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" + "Cc\0linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 08/12/15 10:26, Haibo Chen wrote:\n" "> Add imx7d ADC support.\n" "> \n" - "> Signed-off-by: Haibo Chen <haibo.chen@freescale.com>\n" + "> Signed-off-by: Haibo Chen <haibo.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n" "The driver is now working its way in the direction of linux-next via\n" "Greg KHs tree. I'm happy to take these changes as well, but would imagine\n" "they are better routed through the relevant imx trees.\n" @@ -59,4 +60,4 @@ "> \t\t\t\treg = <0x30660000 0x10000>;\n" > -14d83f77aa6c3810072792835cee9a0a5c3cc17812d067c03cc5ef936bfe2999 +ebe966cb9d4801d30e766d0e5e994c4c50a4b2897aaef3761cd7aab52206cb2e
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.