diff for duplicates of <20180507182317.7406c682@archlinux> diff --git a/a/1.txt b/N1/1.txt index a3c533a..7676b79 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,7 +23,7 @@ Jonathan > status = "disabled"; > }; > -> + adc: adc@48003000 { +> + adc: adc at 48003000 { > + compatible = "st,stm32mp1-adc-core"; > + reg = <0x48003000 0x400>; > + interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, @@ -36,7 +36,7 @@ Jonathan > + #size-cells = <0>; > + status = "disabled"; > + -> + adc1: adc@0 { +> + adc1: adc at 0 { > + compatible = "st,stm32mp1-adc"; > + #io-channel-cells = <1>; > + reg = <0x0>; @@ -45,7 +45,7 @@ Jonathan > + status = "disabled"; > + }; > + -> + adc2: adc@100 { +> + adc2: adc at 100 { > + compatible = "st,stm32mp1-adc"; > + #io-channel-cells = <1>; > + reg = <0x100>; @@ -55,6 +55,6 @@ Jonathan > + }; > + }; > + -> rcc: rcc@50000000 { +> rcc: rcc at 50000000 { > compatible = "st,stm32mp1-rcc", "syscon"; > reg = <0x50000000 0x1000>; diff --git a/a/content_digest b/N1/content_digest index 645157c..954d038 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,9 @@ "ref\01525247091-18143-1-git-send-email-fabrice.gasnier@st.com\0" "ref\01525247091-18143-4-git-send-email-fabrice.gasnier@st.com\0" - "From\0Jonathan Cameron <jic23@kernel.org>\0" - "Subject\0Re: [PATCH v2 3/3] ARM: dts: stm32: Add ADC support to stm32mp157c\0" + "From\0jic23@kernel.org (Jonathan Cameron)\0" + "Subject\0[PATCH v2 3/3] ARM: dts: stm32: Add ADC support to stm32mp157c\0" "Date\0Mon, 7 May 2018 18:23:17 +0100\0" - "To\0Fabrice Gasnier <fabrice.gasnier@st.com>\0" - "Cc\0<robh+dt@kernel.org>" - <alexandre.torgue@st.com> - <mark.rutland@arm.com> - <mcoquelin.stm32@gmail.com> - <lars@metafoo.de> - <knaack.h@gmx.de> - <pmeerw@pmeerw.net> - <linux-iio@vger.kernel.org> - <devicetree@vger.kernel.org> - <linux-arm-kernel@lists.infradead.org> - <linux-kernel@vger.kernel.org> - " <benjamin.gaignard@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, 2 May 2018 09:44:51 +0200\n" @@ -43,7 +31,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> +\t\tadc: adc@48003000 {\n" + "> +\t\tadc: adc at 48003000 {\n" "> +\t\t\tcompatible = \"st,stm32mp1-adc-core\";\n" "> +\t\t\treg = <0x48003000 0x400>;\n" "> +\t\t\tinterrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,\n" @@ -56,7 +44,7 @@ "> +\t\t\t#size-cells = <0>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\n" - "> +\t\t\tadc1: adc@0 {\n" + "> +\t\t\tadc1: adc at 0 {\n" "> +\t\t\t\tcompatible = \"st,stm32mp1-adc\";\n" "> +\t\t\t\t#io-channel-cells = <1>;\n" "> +\t\t\t\treg = <0x0>;\n" @@ -65,7 +53,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tadc2: adc@100 {\n" + "> +\t\t\tadc2: adc at 100 {\n" "> +\t\t\t\tcompatible = \"st,stm32mp1-adc\";\n" "> +\t\t\t\t#io-channel-cells = <1>;\n" "> +\t\t\t\treg = <0x100>;\n" @@ -75,8 +63,8 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\trcc: rcc@50000000 {\n" + "> \t\trcc: rcc at 50000000 {\n" "> \t\t\tcompatible = \"st,stm32mp1-rcc\", \"syscon\";\n" "> \t\t\treg = <0x50000000 0x1000>;" -55493d3773279df2da65885bbf96214aac4bb07946bba3cf21b9a040c1b04910 +588fc978c5051c4b43b60b3d8ff768e12c162216b295261ded879bc7f12ad269
diff --git a/a/content_digest b/N2/content_digest index 645157c..af3a1e5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,18 +4,18 @@ "Subject\0Re: [PATCH v2 3/3] ARM: dts: stm32: Add ADC support to stm32mp157c\0" "Date\0Mon, 7 May 2018 18:23:17 +0100\0" "To\0Fabrice Gasnier <fabrice.gasnier@st.com>\0" - "Cc\0<robh+dt@kernel.org>" - <alexandre.torgue@st.com> - <mark.rutland@arm.com> - <mcoquelin.stm32@gmail.com> - <lars@metafoo.de> - <knaack.h@gmx.de> - <pmeerw@pmeerw.net> - <linux-iio@vger.kernel.org> - <devicetree@vger.kernel.org> - <linux-arm-kernel@lists.infradead.org> - <linux-kernel@vger.kernel.org> - " <benjamin.gaignard@linaro.org>\0" + "Cc\0robh+dt@kernel.org" + alexandre.torgue@st.com + mark.rutland@arm.com + mcoquelin.stm32@gmail.com + lars@metafoo.de + knaack.h@gmx.de + pmeerw@pmeerw.net + linux-iio@vger.kernel.org + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + " benjamin.gaignard@linaro.org\0" "\00:1\0" "b\0" "On Wed, 2 May 2018 09:44:51 +0200\n" @@ -79,4 +79,4 @@ "> \t\t\tcompatible = \"st,stm32mp1-rcc\", \"syscon\";\n" "> \t\t\treg = <0x50000000 0x1000>;" -55493d3773279df2da65885bbf96214aac4bb07946bba3cf21b9a040c1b04910 +5bb8bf66a6df007c927acb9ed53501f25af2004c6ab8fd0afa13b9751932a4af
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.