diff for duplicates of <1403649878-28242-2-git-send-email-boris.brezillon@free-electrons.com>
diff --git a/a/1.txt b/N1/1.txt
index 8bcfb8b..73a651e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,12 +14,12 @@ index b0b1331..2185ad8 100644
+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi
@@ -34,6 +34,22 @@
- macb0: ethernet@f0028000 {
+ macb0: ethernet at f0028000 {
phy-mode = "rgmii";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ ethernet-phy@1 {
++ ethernet-phy at 1 {
+ interrupt-parent = <&pioB>;
+ interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
+ reg = <1>;
@@ -34,6 +34,6 @@ index b0b1331..2185ad8 100644
+ };
};
- pmc: pmc@fffffc00 {
+ pmc: pmc at fffffc00 {
--
1.8.3.2
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 731b281..33994fb 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001403649878-28242-1-git-send-email-boris.brezillon\@free-electrons.com\0"
]
[
- "From\0Boris BREZILLON <boris.brezillon\@free-electrons.com>\0"
+ "From\0boris.brezillon\@free-electrons.com (Boris BREZILLON)\0"
]
[
"Subject\0[PATCH 1/2] ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards\0"
@@ -11,15 +11,7 @@
"Date\0Wed, 25 Jun 2014 00:44:37 +0200\0"
]
[
- "To\0Nicolas Ferre <nicolas.ferre\@atmel.com>",
- " Jean-Christophe Plagniol-Villard <plagnioj\@jcrosoft.com>",
- " Alexandre Belloni <alexandre.belloni\@free-electrons.com>",
- " Andrew Victor <linux\@maxim.org.za>\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org",
- " Boris BREZILLON <boris.brezillon\@free-electrons.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -44,12 +36,12 @@
"+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi\n",
"\@\@ -34,6 +34,22 \@\@\n",
" \n",
- " \t\t\tmacb0: ethernet\@f0028000 {\n",
+ " \t\t\tmacb0: ethernet at f0028000 {\n",
" \t\t\t\tphy-mode = \"rgmii\";\n",
"+\t\t\t\t#address-cells = <1>;\n",
"+\t\t\t\t#size-cells = <0>;\n",
"+\n",
- "+\t\t\t\tethernet-phy\@1 {\n",
+ "+\t\t\t\tethernet-phy at 1 {\n",
"+\t\t\t\t\tinterrupt-parent = <&pioB>;\n",
"+\t\t\t\t\tinterrupts = <25 IRQ_TYPE_EDGE_FALLING>;\n",
"+\t\t\t\t\treg = <1>;\n",
@@ -64,9 +56,9 @@
"+\t\t\t\t};\n",
" \t\t\t};\n",
" \n",
- " \t\t\tpmc: pmc\@fffffc00 {\n",
+ " \t\t\tpmc: pmc at fffffc00 {\n",
"-- \n",
"1.8.3.2"
]
-ccde71fce226c4fa17b393a19e4dbe85c9ce091c3d71d236b846972bc8166803
+102460c62d5d0d6bdd68297ae957608ffe54c07ffa3064690cb40e6d66e79b61
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.