diff for duplicates of <20131010222053.9063.81702.stgit@localhost> diff --git a/a/1.txt b/N1/1.txt index 7744353..5e8ddd3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -129,7 +129,7 @@ index 0000000..d1642f7 + ranges = <0 0 0x00000000 0x20000000>, + <5 0 0x2c000000 0x01000000>; + -+ nand@0,0 { ++ nand at 0,0 { + linux,mtd-name= "micron,mt29c4g96maz"; + reg = <0 0 0>; + nand-bus-width = <16>; @@ -153,29 +153,29 @@ index 0000000..d1642f7 + #address-cells = <1>; + #size-cells = <1>; + -+ partition@0 { ++ partition at 0 { + label = "SPL"; + reg = <0 0x100000>; + }; -+ partition@0x80000 { ++ partition at 0x80000 { + label = "U-Boot"; + reg = <0x100000 0x180000>; + }; -+ partition@0x1c0000 { ++ partition at 0x1c0000 { + label = "Environment"; + reg = <0x280000 0x100000>; + }; -+ partition@0x280000 { ++ partition at 0x280000 { + label = "Kernel"; + reg = <0x380000 0x300000>; + }; -+ partition@0x780000 { ++ partition at 0x780000 { + label = "Filesystem"; + reg = <0x680000 0x1f980000>; + }; + }; + -+ ethernet@gpmc { ++ ethernet at gpmc { + pinctrl-names = "default"; + pinctrl-0 = <&smsc911x_pins>; + }; @@ -192,7 +192,7 @@ index 75753bb..0020b1d 100644 + / { cpus { - cpu@0 { + cpu at 0 { @@ -17,6 +19,19 @@ linux,default-trigger = "default-on"; }; @@ -239,7 +239,7 @@ index 75753bb..0020b1d 100644 }; + +&gpmc { -+ ethernet@gpmc { ++ ethernet at gpmc { + interrupt-parent = <&gpio6>; + interrupts = <16 8>; + reg = <5 0 0xff>; diff --git a/a/content_digest b/N1/content_digest index 9335632..5bab955 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,8 @@ "ref\020131010221833.9063.49904.stgit@localhost\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 5/8] ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)\0" "Date\0Thu, 10 Oct 2013 15:20:53 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0devicetree@vger.kernel.org" - " linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" "I've tested the serial, MMC, smsc911x, wl12xx, and off-idle support\n" @@ -138,7 +136,7 @@ "+\tranges = <0 0 0x00000000 0x20000000>,\n" "+\t\t <5 0 0x2c000000 0x01000000>;\n" "+\n" - "+\tnand@0,0 {\n" + "+\tnand at 0,0 {\n" "+\t\tlinux,mtd-name= \"micron,mt29c4g96maz\";\n" "+\t\treg = <0 0 0>;\n" "+\t\tnand-bus-width = <16>;\n" @@ -162,29 +160,29 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" "+\n" - "+\t\tpartition@0 {\n" + "+\t\tpartition at 0 {\n" "+\t\t\tlabel = \"SPL\";\n" "+\t\t\treg = <0 0x100000>;\n" "+\t\t};\n" - "+\t\tpartition@0x80000 {\n" + "+\t\tpartition at 0x80000 {\n" "+\t\t\tlabel = \"U-Boot\";\n" "+\t\t\treg = <0x100000 0x180000>;\n" "+\t\t};\n" - "+\t\tpartition@0x1c0000 {\n" + "+\t\tpartition at 0x1c0000 {\n" "+\t\t\tlabel = \"Environment\";\n" "+\t\t\treg = <0x280000 0x100000>;\n" "+\t\t};\n" - "+\t\tpartition@0x280000 {\n" + "+\t\tpartition at 0x280000 {\n" "+\t\t\tlabel = \"Kernel\";\n" "+\t\t\treg = <0x380000 0x300000>;\n" "+\t\t};\n" - "+\t\tpartition@0x780000 {\n" + "+\t\tpartition at 0x780000 {\n" "+\t\t\tlabel = \"Filesystem\";\n" "+\t\t\treg = <0x680000 0x1f980000>;\n" "+\t\t};\n" "+\t};\n" "+\n" - "+\tethernet@gpmc {\n" + "+\tethernet at gpmc {\n" "+\t\tpinctrl-names = \"default\";\n" "+\t\tpinctrl-0 = <&smsc911x_pins>;\n" "+\t};\n" @@ -201,7 +199,7 @@ "+\n" " / {\n" " \tcpus {\n" - " \t\tcpu@0 {\n" + " \t\tcpu at 0 {\n" "@@ -17,6 +19,19 @@\n" " \t\t\tlinux,default-trigger = \"default-on\";\n" " \t\t};\n" @@ -248,11 +246,11 @@ " };\n" "+\n" "+&gpmc {\n" - "+\tethernet@gpmc {\n" + "+\tethernet at gpmc {\n" "+\t\tinterrupt-parent = <&gpio6>;\n" "+\t\tinterrupts = <16 8>;\n" "+\t\treg = <5 0 0xff>;\n" "+\t};\n" +}; -33c7b4b6575f55ce8ab65eab0c9dd8aa49410e0e7bb14619cce9f3bad9926d52 +f642f7948f7d4b28ad3154cbee8b49878fd8a58e171ca077d25f635da31b9408
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.