diff for duplicates of <20181017073813.14127-8-anarsoul@gmail.com>
diff --git a/a/1.txt b/N1/1.txt
index 353f73f..f067331 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -62,7 +62,7 @@ index d3daf90a8715..d066ed59f27a 100644
+ status = "disabled";
+ };
+
-+ codec: codec@1c22e00 {
++ codec: codec at 1c22e00 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun8i-a33-codec";
+ reg = <0x01c22e00 0x600>;
@@ -72,20 +72,20 @@ index d3daf90a8715..d066ed59f27a 100644
+ status = "disabled";
+ };
+
- uart0: serial@1c28000 {
+ uart0: serial at 1c28000 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
@@ -715,6 +767,12 @@
#reset-cells = <1>;
};
-+ codec_analog: codec-analog@1f015c0 {
++ codec_analog: codec-analog at 1f015c0 {
+ compatible = "allwinner,sun50i-a64-codec-analog";
+ reg = <0x01f015c0 0x4>;
+ status = "disabled";
+ };
+
- r_i2c: i2c@1f02400 {
+ r_i2c: i2c at 1f02400 {
compatible = "allwinner,sun50i-a64-i2c",
"allwinner,sun6i-a31-i2c";
--
diff --git a/a/content_digest b/N1/content_digest
index 578e297..71f31ed 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\00020181017073813.14127-1-anarsoul\@gmail.com\0"
]
[
- "From\0Vasily Khoruzhick <anarsoul\@gmail.com>\0"
+ "From\0anarsoul\@gmail.com (Vasily Khoruzhick)\0"
]
[
"Subject\0[PATCH v5 7/9] arm64: dts: allwinner: a64: add nodes necessary for analog sound support\0"
@@ -11,22 +11,7 @@
"Date\0Wed, 17 Oct 2018 00:38:11 -0700\0"
]
[
- "To\0Liam Girdwood <lgirdwood\@gmail.com>",
- " Mark Brown <broonie\@kernel.org>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Maxime Ripard <maxime.ripard\@bootlin.com>",
- " Jaroslav Kysela <perex\@perex.cz>",
- " Takashi Iwai <tiwai\@suse.com>",
- " Marcus Cooper <codekipper\@gmail.com>",
- " Mylene JOSSERAND <mylene.josserand\@free-electrons.com>",
- " alsa-devel\@alsa-project.org",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " Jerome Brunet <jbrunet\@baylibre.com>\0"
-]
-[
- "Cc\0Vasily Khoruzhick <anarsoul\@gmail.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -99,7 +84,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tcodec: codec\@1c22e00 {\n",
+ "+\t\tcodec: codec at 1c22e00 {\n",
"+\t\t\t#sound-dai-cells = <0>;\n",
"+\t\t\tcompatible = \"allwinner,sun8i-a33-codec\";\n",
"+\t\t\treg = <0x01c22e00 0x600>;\n",
@@ -109,24 +94,24 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\tuart0: serial\@1c28000 {\n",
+ " \t\tuart0: serial at 1c28000 {\n",
" \t\t\tcompatible = \"snps,dw-apb-uart\";\n",
" \t\t\treg = <0x01c28000 0x400>;\n",
"\@\@ -715,6 +767,12 \@\@\n",
" \t\t\t#reset-cells = <1>;\n",
" \t\t};\n",
" \n",
- "+\t\tcodec_analog: codec-analog\@1f015c0 {\n",
+ "+\t\tcodec_analog: codec-analog at 1f015c0 {\n",
"+\t\t\tcompatible = \"allwinner,sun50i-a64-codec-analog\";\n",
"+\t\t\treg = <0x01f015c0 0x4>;\n",
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\tr_i2c: i2c\@1f02400 {\n",
+ " \t\tr_i2c: i2c at 1f02400 {\n",
" \t\t\tcompatible = \"allwinner,sun50i-a64-i2c\",\n",
" \t\t\t\t \"allwinner,sun6i-a31-i2c\";\n",
"-- \n",
"2.19.0"
]
-6f56424f6659ca9f6ac91a47e1b169969044e7ecac9f008cb7ee1cc5a53abf67
+15e0046f43e8fa494a77c55b75bfd8e1c7585d4e9ea4375e04b9742f657d7267
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.