diff for duplicates of <20170710215607.1ef3caae@kernel.org> diff --git a/a/1.txt b/N1/1.txt index eeab26f..7f57983 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ Acked-by: Joanthan Cameron <Jonathan.Cameron@huawei.com> > status = "disabled"; > }; > -> + dac: dac@40007400 { +> + dac: dac at 40007400 { > + compatible = "st,stm32f4-dac-core"; > + reg = <0x40007400 0x400>; > + resets = <&rcc STM32F4_APB1_RESET(DAC)>; @@ -31,14 +31,14 @@ Acked-by: Joanthan Cameron <Jonathan.Cameron@huawei.com> > + #size-cells = <0>; > + status = "disabled"; > + -> + dac1: dac@1 { +> + dac1: dac at 1 { > + compatible = "st,stm32-dac"; > + #io-channels-cells = <1>; > + reg = <1>; > + status = "disabled"; > + }; > + -> + dac2: dac@2 { +> + dac2: dac at 2 { > + compatible = "st,stm32-dac"; > + #io-channels-cells = <1>; > + reg = <2>; @@ -46,6 +46,6 @@ Acked-by: Joanthan Cameron <Jonathan.Cameron@huawei.com> > + }; > + }; > + -> usart7: serial@40007800 { +> usart7: serial at 40007800 { > compatible = "st,stm32-usart", "st,stm32-uart"; > reg = <0x40007800 0x400>; diff --git a/a/content_digest b/N1/content_digest index 88f8ada..0621a68 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,9 @@ "ref\01499693040-12994-1-git-send-email-fabrice.gasnier@st.com\0" "ref\01499693040-12994-5-git-send-email-fabrice.gasnier@st.com\0" - "From\0Jonathan Cameron <jic23@kernel.org>\0" - "Subject\0Re: [PATCH 4/4] ARM: dts: stm32: Add DAC support on stm32f429\0" + "From\0jic23@kernel.org (Jonathan Cameron)\0" + "Subject\0[PATCH 4/4] ARM: dts: stm32: Add DAC support on stm32f429\0" "Date\0Mon, 10 Jul 2017 21:56:07 +0100\0" - "To\0Fabrice Gasnier <fabrice.gasnier@st.com>\0" - "Cc\0<robh+dt@kernel.org>" - <linux@armlinux.org.uk> - <mark.rutland@arm.com> - <mcoquelin.stm32@gmail.com> - <alexandre.torgue@st.com> - <lars@metafoo.de> - <knaack.h@gmx.de> - <pmeerw@pmeerw.net> - <benjamin.gaignard@linaro.org> - <benjamin.gaignard@st.com> - <linux-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 Mon, 10 Jul 2017 15:24:00 +0200\n" @@ -43,7 +29,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> +\t\tdac: dac@40007400 {\n" + "> +\t\tdac: dac at 40007400 {\n" "> +\t\t\tcompatible = \"st,stm32f4-dac-core\";\n" "> +\t\t\treg = <0x40007400 0x400>;\n" "> +\t\t\tresets = <&rcc STM32F4_APB1_RESET(DAC)>;\n" @@ -53,14 +39,14 @@ "> +\t\t\t#size-cells = <0>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\n" - "> +\t\t\tdac1: dac@1 {\n" + "> +\t\t\tdac1: dac at 1 {\n" "> +\t\t\t\tcompatible = \"st,stm32-dac\";\n" "> +\t\t\t\t#io-channels-cells = <1>;\n" "> +\t\t\t\treg = <1>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tdac2: dac@2 {\n" + "> +\t\t\tdac2: dac at 2 {\n" "> +\t\t\t\tcompatible = \"st,stm32-dac\";\n" "> +\t\t\t\t#io-channels-cells = <1>;\n" "> +\t\t\t\treg = <2>;\n" @@ -68,8 +54,8 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tusart7: serial@40007800 {\n" + "> \t\tusart7: serial at 40007800 {\n" "> \t\t\tcompatible = \"st,stm32-usart\", \"st,stm32-uart\";\n" "> \t\t\treg = <0x40007800 0x400>;" -4fa03c40f7b683aecb2a6f083fd05c5cf9b5615ba99807f632cfdd1a52bbd0dc +538ba1734ea4fee31fe6f9578ad7a6e9206d86449c16d3bc1b737ac283eb89ee
diff --git a/a/1.txt b/N2/1.txt index eeab26f..a7ca349 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,14 +1,14 @@ On Mon, 10 Jul 2017 15:24:00 +0200 -Fabrice Gasnier <fabrice.gasnier@st.com> wrote: +Fabrice Gasnier <fabrice.gasnier-qxv4g6HH51o@public.gmane.org> wrote: > Add support for DAC (Digital to Analog Converter) to STM32F429. > STM32F429 DAC has two output channels. > -> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com> +> Signed-off-by: Fabrice Gasnier <fabrice.gasnier-qxv4g6HH51o@public.gmane.org> Driver support is working it's way towards mainline, though will be next merge window now so no real rush on this one! -Acked-by: Joanthan Cameron <Jonathan.Cameron@huawei.com> +Acked-by: Joanthan Cameron <Jonathan.Cameron-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> > --- > arch/arm/boot/dts/stm32f429.dtsi | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) diff --git a/a/content_digest b/N2/content_digest index 88f8ada..17562fb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,36 +1,37 @@ "ref\01499693040-12994-1-git-send-email-fabrice.gasnier@st.com\0" "ref\01499693040-12994-5-git-send-email-fabrice.gasnier@st.com\0" - "From\0Jonathan Cameron <jic23@kernel.org>\0" + "ref\01499693040-12994-5-git-send-email-fabrice.gasnier-qxv4g6HH51o@public.gmane.org\0" + "From\0Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCH 4/4] ARM: dts: stm32: Add DAC support on stm32f429\0" "Date\0Mon, 10 Jul 2017 21:56:07 +0100\0" - "To\0Fabrice Gasnier <fabrice.gasnier@st.com>\0" - "Cc\0<robh+dt@kernel.org>" - <linux@armlinux.org.uk> - <mark.rutland@arm.com> - <mcoquelin.stm32@gmail.com> - <alexandre.torgue@st.com> - <lars@metafoo.de> - <knaack.h@gmx.de> - <pmeerw@pmeerw.net> - <benjamin.gaignard@linaro.org> - <benjamin.gaignard@st.com> - <linux-iio@vger.kernel.org> - <devicetree@vger.kernel.org> - <linux-arm-kernel@lists.infradead.org> - " <linux-kernel@vger.kernel.org>\0" + "To\0Fabrice Gasnier <fabrice.gasnier-qxv4g6HH51o@public.gmane.org>\0" + "Cc\0robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + mcoquelin.stm32-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org + alexandre.torgue-qxv4g6HH51o@public.gmane.org + lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org + knaack.h-Mmb7MZpHnFY@public.gmane.org + pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org + benjamin.gaignard-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org + benjamin.gaignard-qxv4g6HH51o@public.gmane.org + linux-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 Mon, 10 Jul 2017 15:24:00 +0200\n" - "Fabrice Gasnier <fabrice.gasnier@st.com> wrote:\n" + "Fabrice Gasnier <fabrice.gasnier-qxv4g6HH51o@public.gmane.org> wrote:\n" "\n" "> Add support for DAC (Digital to Analog Converter) to STM32F429.\n" "> STM32F429 DAC has two output channels.\n" "> \n" - "> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>\n" + "> Signed-off-by: Fabrice Gasnier <fabrice.gasnier-qxv4g6HH51o@public.gmane.org>\n" "Driver support is working it's way towards mainline, though will be\n" "next merge window now so no real rush on this one!\n" "\n" - "Acked-by: Joanthan Cameron <Jonathan.Cameron@huawei.com>\n" + "Acked-by: Joanthan Cameron <Jonathan.Cameron-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/stm32f429.dtsi | 25 +++++++++++++++++++++++++\n" "> 1 file changed, 25 insertions(+)\n" @@ -72,4 +73,4 @@ "> \t\t\tcompatible = \"st,stm32-usart\", \"st,stm32-uart\";\n" "> \t\t\treg = <0x40007800 0x400>;" -4fa03c40f7b683aecb2a6f083fd05c5cf9b5615ba99807f632cfdd1a52bbd0dc +c042a05966f866287a7b99eee6b91525dc8d94f024b83dc7ce8cb9557220a4ed
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.