diff for duplicates of <1469105055-25181-20-git-send-email-jaz@semihalf.com>
diff --git a/a/1.txt b/N1/1.txt
index 522add7..3ab0822 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -83,24 +83,24 @@ index 0000000..eb53306
+ MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;
+
+ internal-regs {
-+ i2c@11000 {
++ i2c at 11000 {
+ status = "okay";
+ clock-frequency = <100000>;
+ };
+
-+ serial@12000 {
++ serial at 12000 {
+ status = "okay";
+ };
+
-+ usb@58000 {
++ usb at 58000 {
+ status = "okay";
+ };
+
-+ sata@a8000 {
++ sata at a8000 {
+ status = "okay";
+ };
+
-+ flash@d0000 {
++ flash at d0000 {
+ status = "okay";
+ pinctrl-0 = <&nand_pins>;
+ pinctrl-names = "default";
@@ -116,26 +116,26 @@ index 0000000..eb53306
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ partition@0 {
++ partition at 0 {
+ label = "U-Boot";
+ reg = <0x00000000 0x00600000>;
+ read-only;
+ };
+
-+ partition@800000 {
++ partition at 800000 {
+ label = "uImage";
+ reg = <0x00600000 0x00400000>;
+ read-only;
+ };
+
-+ partition@1000000 {
++ partition at 1000000 {
+ label = "Root";
+ reg = <0x00a00000 0x3f600000>;
+ };
+ };
+ };
+
-+ sdhci@d8000 {
++ sdhci at d8000 {
+ clock-frequency = <200000000>;
+ broken-cd;
+ wp-inverted;
@@ -144,7 +144,7 @@ index 0000000..eb53306
+ no-1-8-v;
+ };
+
-+ usb3@f0000 {
++ usb3 at f0000 {
+ status = "okay";
+ };
+ };
@@ -156,12 +156,12 @@ index 0000000..eb53306
+ * The two PCIe units are accessible through
+ * mini PCIe slot on the board.
+ */
-+ pcie@2,0 {
++ pcie at 2,0 {
+ /* Port 1, Lane 0 */
+ status = "okay";
+ };
+
-+ pcie@4,0 {
++ pcie at 4,0 {
+ /* Port 3, Lane 0 */
+ status = "okay";
+ };
diff --git a/a/content_digest b/N1/content_digest
index 32d79f6..eaab57e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001469105055-25181-1-git-send-email-jaz\@semihalf.com\0"
]
[
- "From\0Grzegorz Jaszczyk <jaz\@semihalf.com>\0"
+ "From\0jaz\@semihalf.com (Grzegorz Jaszczyk)\0"
]
[
"Subject\0[PATCH 18/18] ARM: mvebu: a395-gp: add support for the Armada 395 GP Board\0"
@@ -11,22 +11,7 @@
"Date\0Thu, 21 Jul 2016 14:44:15 +0200\0"
]
[
- "To\0devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org\0"
-]
-[
- "Cc\0robh+dt\@kernel.org",
- " mark.rutland\@arm.com",
- " jason\@lakedaemon.net",
- " andrew\@lunn.ch",
- " sebastian.hesselbarth\@gmail.com",
- " linux\@armlinux.org.uk",
- " thomas.petazzoni\@free-electrons.com",
- " gregory.clement\@free-electrons.com",
- " mw\@semihalf.com",
- " jaz\@semihalf.com",
- " alior\@marvell.com\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -120,24 +105,24 @@
"+\t\t\t MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;\n",
"+\n",
"+\t\tinternal-regs {\n",
- "+\t\t\ti2c\@11000 {\n",
+ "+\t\t\ti2c at 11000 {\n",
"+\t\t\t\tstatus = \"okay\";\n",
"+\t\t\t\tclock-frequency = <100000>;\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tserial\@12000 {\n",
+ "+\t\t\tserial at 12000 {\n",
"+\t\t\t\tstatus = \"okay\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tusb\@58000 {\n",
+ "+\t\t\tusb at 58000 {\n",
"+\t\t\t\tstatus = \"okay\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tsata\@a8000 {\n",
+ "+\t\t\tsata at a8000 {\n",
"+\t\t\t\tstatus = \"okay\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tflash\@d0000 {\n",
+ "+\t\t\tflash at d0000 {\n",
"+\t\t\t\tstatus = \"okay\";\n",
"+\t\t\t\tpinctrl-0 = <&nand_pins>;\n",
"+\t\t\t\tpinctrl-names = \"default\";\n",
@@ -153,26 +138,26 @@
"+\t\t\t\t\t#address-cells = <1>;\n",
"+\t\t\t\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\t\t\t\tpartition\@0 {\n",
+ "+\t\t\t\t\tpartition at 0 {\n",
"+\t\t\t\t\t\tlabel = \"U-Boot\";\n",
"+\t\t\t\t\t\treg = <0x00000000 0x00600000>;\n",
"+\t\t\t\t\t\tread-only;\n",
"+\t\t\t\t\t};\n",
"+\n",
- "+\t\t\t\t\tpartition\@800000 {\n",
+ "+\t\t\t\t\tpartition at 800000 {\n",
"+\t\t\t\t\t\tlabel = \"uImage\";\n",
"+\t\t\t\t\t\treg = <0x00600000 0x00400000>;\n",
"+\t\t\t\t\t\tread-only;\n",
"+\t\t\t\t\t};\n",
"+\n",
- "+\t\t\t\t\tpartition\@1000000 {\n",
+ "+\t\t\t\t\tpartition at 1000000 {\n",
"+\t\t\t\t\t\tlabel = \"Root\";\n",
"+\t\t\t\t\t\treg = <0x00a00000 0x3f600000>;\n",
"+\t\t\t\t\t};\n",
"+\t\t\t\t};\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tsdhci\@d8000 {\n",
+ "+\t\t\tsdhci at d8000 {\n",
"+\t\t\t\tclock-frequency = <200000000>;\n",
"+\t\t\t\tbroken-cd;\n",
"+\t\t\t\twp-inverted;\n",
@@ -181,7 +166,7 @@
"+\t\t\t\tno-1-8-v;\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tusb3\@f0000 {\n",
+ "+\t\t\tusb3 at f0000 {\n",
"+\t\t\t\tstatus = \"okay\";\n",
"+\t\t\t};\n",
"+\t\t};\n",
@@ -193,12 +178,12 @@
"+\t\t\t * The two PCIe units are accessible through\n",
"+\t\t\t * mini PCIe slot on the board.\n",
"+\t\t\t */\n",
- "+\t\t\tpcie\@2,0 {\n",
+ "+\t\t\tpcie at 2,0 {\n",
"+\t\t\t\t/* Port 1, Lane 0 */\n",
"+\t\t\t\tstatus = \"okay\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tpcie\@4,0 {\n",
+ "+\t\t\tpcie at 4,0 {\n",
"+\t\t\t\t/* Port 3, Lane 0 */\n",
"+\t\t\t\tstatus = \"okay\";\n",
"+\t\t\t};\n",
@@ -209,4 +194,4 @@
"1.8.3.1"
]
-71b93ae9e7e94491b000793ec78365378079a675fd97ef4325f4c6c28ce491e7
+3c4c73eed2a449fb799c2de039348a9c43316c3c7736bce7e06f36fab3391b24
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.