diff for duplicates of <1436771969.15768.6.camel@mtksdaap41> diff --git a/a/1.txt b/N1/1.txt index 63ad9d1..1ccf0ab 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,7 @@ The above patch was already merged, so now it is OK to merge this one > > branch: v4.2-next/arm64 > > > > Changes since v1: -> > - change node name to afe: audio-controller@11220000 +> > - change node name to afe: audio-controller at 11220000 > > --- > > arch/arm64/boot/dts/mediatek/mt8173.dtsi | 32 ++++++++++++++++++++++++++++++++ > > 1 file changed, 32 insertions(+) @@ -48,7 +48,7 @@ The above patch was already merged, so now it is OK to merge this one > > status = "disabled"; > > }; > > + -> > + afe: audio-controller@11220000 { +> > + afe: audio-controller at 11220000 { > > + compatible = "mediatek,mt8173-afe-pcm"; > > + reg = <0 0x11220000 0 0x1000>; > > + interrupts = <GIC_SPI 134 IRQ_TYPE_EDGE_FALLING>; diff --git a/a/content_digest b/N1/content_digest index 79696b0..69d55e4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,9 @@ "ref\01436412725-55129-1-git-send-email-koro.chen@mediatek.com\0" "ref\0CAGS+omBqO6Zcw9KuN6p9YDvRD=UfmOnokUPeRo-iv6ruTBChwg@mail.gmail.com\0" - "From\0Koro Chen <koro.chen@mediatek.com>\0" - "Subject\0Re: [PATCH v2] arm64: dts: mt8173: Add afe device node\0" + "From\0koro.chen@mediatek.com (Koro Chen)\0" + "Subject\0[PATCH v2] arm64: dts: mt8173: Add afe device node\0" "Date\0Mon, 13 Jul 2015 15:19:29 +0800\0" - "To\0Daniel Kurtz <djkurtz@chromium.org>\0" - "Cc\0Matthias Brugger <matthias.bgg@gmail.com>" - srv_heupstream <srv_heupstream@mediatek.com> - linux-mediatek@lists.infradead.org - Sascha Hauer <s.hauer@pengutronix.de> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - alsa-devel@alsa-project.org - " open list:OPEN FIRMWARE AND... <devicetree@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, 2015-07-09 at 18:45 +0800, Daniel Kurtz wrote:\n" @@ -42,7 +34,7 @@ "> > branch: v4.2-next/arm64\n" "> >\n" "> > Changes since v1:\n" - "> > - change node name to afe: audio-controller@11220000\n" + "> > - change node name to afe: audio-controller at 11220000\n" "> > ---\n" "> > arch/arm64/boot/dts/mediatek/mt8173.dtsi | 32 ++++++++++++++++++++++++++++++++\n" "> > 1 file changed, 32 insertions(+)\n" @@ -64,7 +56,7 @@ "> > status = \"disabled\";\n" "> > };\n" "> > +\n" - "> > + afe: audio-controller@11220000 {\n" + "> > + afe: audio-controller at 11220000 {\n" "> > + compatible = \"mediatek,mt8173-afe-pcm\";\n" "> > + reg = <0 0x11220000 0 0x1000>;\n" "> > + interrupts = <GIC_SPI 134 IRQ_TYPE_EDGE_FALLING>;\n" @@ -101,4 +93,4 @@ "> > 1.8.1.1.dirty\n" > > -ad26ba1eb0b5d68afedccfc234db4daeb8b575a5fe57c955e6bad3a4a62bb86d +8e0f8641354bb1566f87f3f33c51a853b2fe5cf4911f57358a9d0537ba6049b0
diff --git a/a/content_digest b/N2/content_digest index 79696b0..e81d283 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,11 +6,11 @@ "To\0Daniel Kurtz <djkurtz@chromium.org>\0" "Cc\0Matthias Brugger <matthias.bgg@gmail.com>" srv_heupstream <srv_heupstream@mediatek.com> - linux-mediatek@lists.infradead.org + <linux-mediatek@lists.infradead.org> Sascha Hauer <s.hauer@pengutronix.de> linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - alsa-devel@alsa-project.org + <alsa-devel@alsa-project.org> " open list:OPEN FIRMWARE AND... <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" @@ -101,4 +101,4 @@ "> > 1.8.1.1.dirty\n" > > -ad26ba1eb0b5d68afedccfc234db4daeb8b575a5fe57c955e6bad3a4a62bb86d +ae0c6ffcaffb0da03bd2582f5b553b0f1015d13e90935f9cb18d3ceaf9963855
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.