diff for duplicates of <09abd1fd11f98d6abde9c23244234170e7e36c2f.1403487225.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index e8da30a..666f18c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ index 43d2130..1997f16 100644
status = "disabled";
};
+
-+ rcar_sound: rcar_sound@0xec500000 {
++ rcar_sound: rcar_sound at 0xec500000 {
+ #sound-dai-cells = <1>;
+ compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
+ interrupt-parent = <&gic>;
@@ -47,29 +47,29 @@ index 43d2130..1997f16 100644
+ status = "disabled";
+
+ rcar_sound,src {
-+ src0: src@0 { };
-+ src1: src@1 { };
-+ src2: src@2 { };
-+ src3: src@3 { };
-+ src4: src@4 { };
-+ src5: src@5 { };
-+ src6: src@6 { };
-+ src7: src@7 { };
-+ src8: src@8 { };
-+ src9: src@9 { };
++ src0: src at 0 { };
++ src1: src at 1 { };
++ src2: src at 2 { };
++ src3: src at 3 { };
++ src4: src at 4 { };
++ src5: src at 5 { };
++ src6: src at 6 { };
++ src7: src at 7 { };
++ src8: src at 8 { };
++ src9: src at 9 { };
+ };
+
+ rcar_sound,ssi {
-+ ssi0: ssi@0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };
-+ ssi1: ssi@1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };
-+ ssi2: ssi@2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };
-+ ssi3: ssi@3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };
-+ ssi4: ssi@4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };
-+ ssi5: ssi@5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };
-+ ssi6: ssi@6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };
-+ ssi7: ssi@7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };
-+ ssi8: ssi@8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };
-+ ssi9: ssi@9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi0: ssi at 0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi1: ssi at 1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi2: ssi at 2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi3: ssi at 3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi4: ssi at 4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi5: ssi at 5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi6: ssi at 6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi7: ssi at 7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi8: ssi at 8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };
++ ssi9: ssi at 9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };
+ };
+ };
};
diff --git a/a/content_digest b/N1/content_digest
index ad5c742..6b1e037 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1403487225.git.horms+renesas\@verge.net.au\0"
]
[
- "From\0Simon Horman <horms+renesas\@verge.net.au>\0"
+ "From\0horms+renesas\@verge.net.au (Simon Horman)\0"
]
[
"Subject\0[PATCH 29/29] ARM: shmobile: r8a7791: add R-Car sound support on DTSI\0"
]
[
- "Date\0Mon, 23 Jun 2014 02:28:38 +0000\0"
+ "Date\0Mon, 23 Jun 2014 11:28:38 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -39,7 +39,7 @@
" \t\tstatus = \"disabled\";\n",
" \t};\n",
"+\n",
- "+\trcar_sound: rcar_sound\@0xec500000 {\n",
+ "+\trcar_sound: rcar_sound at 0xec500000 {\n",
"+\t\t#sound-dai-cells = <1>;\n",
"+\t\tcompatible = \"renesas,rcar_sound-r8a7791\", \"renesas,rcar_sound-gen2\", \"renesas,rcar_sound\";\n",
"+\t\tinterrupt-parent = <&gic>;\n",
@@ -69,29 +69,29 @@
"+\t\tstatus = \"disabled\";\n",
"+\n",
"+\t\trcar_sound,src {\n",
- "+\t\t\tsrc0: src\@0 { };\n",
- "+\t\t\tsrc1: src\@1 { };\n",
- "+\t\t\tsrc2: src\@2 { };\n",
- "+\t\t\tsrc3: src\@3 { };\n",
- "+\t\t\tsrc4: src\@4 { };\n",
- "+\t\t\tsrc5: src\@5 { };\n",
- "+\t\t\tsrc6: src\@6 { };\n",
- "+\t\t\tsrc7: src\@7 { };\n",
- "+\t\t\tsrc8: src\@8 { };\n",
- "+\t\t\tsrc9: src\@9 { };\n",
+ "+\t\t\tsrc0: src at 0 { };\n",
+ "+\t\t\tsrc1: src at 1 { };\n",
+ "+\t\t\tsrc2: src at 2 { };\n",
+ "+\t\t\tsrc3: src at 3 { };\n",
+ "+\t\t\tsrc4: src at 4 { };\n",
+ "+\t\t\tsrc5: src at 5 { };\n",
+ "+\t\t\tsrc6: src at 6 { };\n",
+ "+\t\t\tsrc7: src at 7 { };\n",
+ "+\t\t\tsrc8: src at 8 { };\n",
+ "+\t\t\tsrc9: src at 9 { };\n",
"+\t\t};\n",
"+\n",
"+\t\trcar_sound,ssi {\n",
- "+\t\t\tssi0: ssi\@0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };\n",
- "+\t\t\tssi1: ssi\@1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };\n",
- "+\t\t\tssi2: ssi\@2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };\n",
- "+\t\t\tssi3: ssi\@3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };\n",
- "+\t\t\tssi4: ssi\@4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };\n",
- "+\t\t\tssi5: ssi\@5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };\n",
- "+\t\t\tssi6: ssi\@6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };\n",
- "+\t\t\tssi7: ssi\@7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };\n",
- "+\t\t\tssi8: ssi\@8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };\n",
- "+\t\t\tssi9: ssi\@9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi0: ssi at 0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi1: ssi at 1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi2: ssi at 2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi3: ssi at 3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi4: ssi at 4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi5: ssi at 5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi6: ssi at 6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi7: ssi at 7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi8: ssi at 8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };\n",
+ "+\t\t\tssi9: ssi at 9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };\n",
"+\t\t};\n",
"+\t};\n",
" };\n",
@@ -99,4 +99,4 @@
"2.0.0.rc2"
]
-e83067c0ccf398f9a0abfe30ff7e95080942bddb014e81e87d35842bda833c2e
+c65f2de6f46812be0c90f273a52febcbe7d142d93b53d9b0bb574e68b71e0690
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.