diff for duplicates of <20170505220115.143025-2-maxims@google.com> diff --git a/a/1.txt b/N1/1.txt index d959993..4734968 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,7 +31,7 @@ index 97fac69d11..7e0ad3a41a 100644 reg = <0x1e6c0080 0x80>; }; -+ mac0: ethernet@1e660000 { ++ mac0: ethernet at 1e660000 { + compatible = "faraday,ftgmac100"; + reg = <0x1e660000 0x180>; + interrupts = <2>; @@ -39,7 +39,7 @@ index 97fac69d11..7e0ad3a41a 100644 + status = "disabled"; + }; + -+ mac1: ethernet@1e680000 { ++ mac1: ethernet at 1e680000 { + compatible = "faraday,ftgmac100"; + reg = <0x1e680000 0x180>; + interrupts = <3>; @@ -54,7 +54,7 @@ index 97fac69d11..7e0ad3a41a 100644 reg = <0x1e6e2070 0x04>; }; -+ syscon: syscon@1e6e2000 { ++ syscon: syscon at 1e6e2000 { + compatible = "aspeed,g5-scu", "syscon", "simple-mfd"; + reg = <0x1e6e2000 0x1a8>; + @@ -870,25 +870,25 @@ index 97fac69d11..7e0ad3a41a 100644 + }; + }; + - clk_hpll: clk_hpll@1e6e2024 { + clk_hpll: clk_hpll at 1e6e2024 { #clock-cells = <0>; compatible = "aspeed,g5-hpll-clock"; @@ -75,11 +907,27 @@ reg = <0x1e6e202c 0x4>; }; -+ gfx: display@1e6e6000 { ++ gfx: display at 1e6e6000 { + compatible = "aspeed,ast2500-gfx", "syscon"; + reg = <0x1e6e6000 0x1000>; + reg-io-width = <4>; + }; + - sram@1e720000 { + sram at 1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x9000>; // 36K }; -+ gpio: gpio@1e780000 { ++ gpio: gpio at 1e780000 { + #gpio-cells = <2>; + gpio-controller; + compatible = "aspeed,ast2500-gpio"; @@ -898,7 +898,7 @@ index 97fac69d11..7e0ad3a41a 100644 + interrupt-controller; + }; + - timer: timer@1e782000 { + timer: timer at 1e782000 { compatible = "aspeed,ast2400-timer"; reg = <0x1e782000 0x90>; @@ -90,6 +938,7 @@ @@ -906,14 +906,14 @@ index 97fac69d11..7e0ad3a41a 100644 }; + - wdt1: wdt@1e785000 { + wdt1: wdt at 1e785000 { compatible = "aspeed,wdt"; reg = <0x1e785000 0x1c>; @@ -119,6 +968,36 @@ status = "disabled"; }; -+ lpc: lpc@1e789000 { ++ lpc: lpc at 1e789000 { + compatible = "aspeed,ast2500-lpc", "simple-mfd"; + reg = <0x1e789000 0x1000>; + @@ -921,12 +921,12 @@ index 97fac69d11..7e0ad3a41a 100644 + #size-cells = <1>; + ranges = <0 0x1e789000 0x1000>; + -+ lpc_bmc: lpc-bmc@0 { ++ lpc_bmc: lpc-bmc at 0 { + compatible = "aspeed,ast2500-lpc-bmc"; + reg = <0x0 0x80>; + }; + -+ lpc_host: lpc-host@80 { ++ lpc_host: lpc-host at 80 { + compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon"; + reg = <0x80 0x1e0>; + @@ -936,14 +936,14 @@ index 97fac69d11..7e0ad3a41a 100644 + + reg-io-width = <4>; + -+ lhc: lhc@20 { ++ lhc: lhc at 20 { + compatible = "aspeed,ast2500-lhc"; + reg = <0x20 0x24 0x48 0x8>; + }; + }; + }; + - uart2: serial@1e78d000 { + uart2: serial at 1e78d000 { compatible = "ns16550a"; reg = <0x1e78d000 0x1000>; -- diff --git a/a/content_digest b/N1/content_digest index 3db29a3..7e95b73 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,9 @@ "ref\020170417190034.71945-1-maxims@google.com\0" "ref\020170505220115.143025-1-maxims@google.com\0" "From\0Maxim Sloyko <maxims@google.com>\0" - "Subject\0[PATCH v2 01/15] aspeed: Update ast2500 Device Tree\0" + "Subject\0[U-Boot] [PATCH v2 01/15] aspeed: Update ast2500 Device Tree\0" "Date\0Fri, 5 May 2017 15:01:01 -0700\0" - "To\0u-boot@lists.denx.de" - " Simon Glass <sjg@chromium.org>\0" - "Cc\0openbmc@lists.ozlabs.org" - Maxim Sloyko <maxims@google.com> - " Albert Aribaud <albert.u.boot@aribaud.net>\0" + "To\0u-boot@lists.denx.de\0" "\00:1\0" "b\0" "Pull in the Device Tree for ast2500 from the mainline Linux kernel.\n" @@ -43,7 +39,7 @@ " \t\t\treg = <0x1e6c0080 0x80>;\n" " \t\t};\n" " \n" - "+\t\tmac0: ethernet@1e660000 {\n" + "+\t\tmac0: ethernet at 1e660000 {\n" "+\t\t\tcompatible = \"faraday,ftgmac100\";\n" "+\t\t\treg = <0x1e660000 0x180>;\n" "+\t\t\tinterrupts = <2>;\n" @@ -51,7 +47,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tmac1: ethernet@1e680000 {\n" + "+\t\tmac1: ethernet at 1e680000 {\n" "+\t\t\tcompatible = \"faraday,ftgmac100\";\n" "+\t\t\treg = <0x1e680000 0x180>;\n" "+\t\t\tinterrupts = <3>;\n" @@ -66,7 +62,7 @@ " \t\t\t\treg = <0x1e6e2070 0x04>;\n" " \t\t\t};\n" " \n" - "+\t\t\tsyscon: syscon@1e6e2000 {\n" + "+\t\t\tsyscon: syscon at 1e6e2000 {\n" "+\t\t\t\tcompatible = \"aspeed,g5-scu\", \"syscon\", \"simple-mfd\";\n" "+\t\t\t\treg = <0x1e6e2000 0x1a8>;\n" "+\n" @@ -882,25 +878,25 @@ "+\t\t\t\t};\n" "+\t\t\t};\n" "+\n" - " \t\t\tclk_hpll: clk_hpll@1e6e2024 {\n" + " \t\t\tclk_hpll: clk_hpll at 1e6e2024 {\n" " \t\t\t\t#clock-cells = <0>;\n" " \t\t\t\tcompatible = \"aspeed,g5-hpll-clock\";\n" "@@ -75,11 +907,27 @@\n" " \t\t\t\treg = <0x1e6e202c 0x4>;\n" " \t\t\t};\n" " \n" - "+\t\t\tgfx: display@1e6e6000 {\n" + "+\t\t\tgfx: display at 1e6e6000 {\n" "+\t\t\t\tcompatible = \"aspeed,ast2500-gfx\", \"syscon\";\n" "+\t\t\t\treg = <0x1e6e6000 0x1000>;\n" "+\t\t\t\treg-io-width = <4>;\n" "+\t\t\t};\n" "+\n" - " \t\t\tsram@1e720000 {\n" + " \t\t\tsram at 1e720000 {\n" " \t\t\t\tcompatible = \"mmio-sram\";\n" " \t\t\t\treg = <0x1e720000 0x9000>;\t// 36K\n" " \t\t\t};\n" " \n" - "+\t\t\tgpio: gpio@1e780000 {\n" + "+\t\t\tgpio: gpio at 1e780000 {\n" "+\t\t\t\t#gpio-cells = <2>;\n" "+\t\t\t\tgpio-controller;\n" "+\t\t\t\tcompatible = \"aspeed,ast2500-gpio\";\n" @@ -910,7 +906,7 @@ "+\t\t\t\tinterrupt-controller;\n" "+\t\t\t};\n" "+\n" - " \t\t\ttimer: timer@1e782000 {\n" + " \t\t\ttimer: timer at 1e782000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2400-timer\";\n" " \t\t\t\treg = <0x1e782000 0x90>;\n" "@@ -90,6 +938,7 @@\n" @@ -918,14 +914,14 @@ " \t\t\t};\n" " \n" "+\n" - " \t\t\twdt1: wdt@1e785000 {\n" + " \t\t\twdt1: wdt at 1e785000 {\n" " \t\t\t\tcompatible = \"aspeed,wdt\";\n" " \t\t\t\treg = <0x1e785000 0x1c>;\n" "@@ -119,6 +968,36 @@\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "+\t\t\tlpc: lpc@1e789000 {\n" + "+\t\t\tlpc: lpc at 1e789000 {\n" "+\t\t\t\tcompatible = \"aspeed,ast2500-lpc\", \"simple-mfd\";\n" "+\t\t\t\treg = <0x1e789000 0x1000>;\n" "+\n" @@ -933,12 +929,12 @@ "+\t\t\t\t#size-cells = <1>;\n" "+\t\t\t\tranges = <0 0x1e789000 0x1000>;\n" "+\n" - "+\t\t\t\tlpc_bmc: lpc-bmc@0 {\n" + "+\t\t\t\tlpc_bmc: lpc-bmc at 0 {\n" "+\t\t\t\t\tcompatible = \"aspeed,ast2500-lpc-bmc\";\n" "+\t\t\t\t\treg = <0x0 0x80>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tlpc_host: lpc-host@80 {\n" + "+\t\t\t\tlpc_host: lpc-host at 80 {\n" "+\t\t\t\t\tcompatible = \"aspeed,ast2500-lpc-host\", \"simple-mfd\", \"syscon\";\n" "+\t\t\t\t\treg = <0x80 0x1e0>;\n" "+\n" @@ -948,17 +944,17 @@ "+\n" "+\t\t\t\t\treg-io-width = <4>;\n" "+\n" - "+\t\t\t\t\tlhc: lhc@20 {\n" + "+\t\t\t\t\tlhc: lhc at 20 {\n" "+\t\t\t\t\t\tcompatible = \"aspeed,ast2500-lhc\";\n" "+\t\t\t\t\t\treg = <0x20 0x24 0x48 0x8>;\n" "+\t\t\t\t\t};\n" "+\t\t\t\t};\n" "+\t\t\t};\n" "+\n" - " \t\t\tuart2: serial@1e78d000 {\n" + " \t\t\tuart2: serial at 1e78d000 {\n" " \t\t\t\tcompatible = \"ns16550a\";\n" " \t\t\t\treg = <0x1e78d000 0x1000>;\n" "-- \n" 2.13.0.rc1.294.g07d810a77f-goog -7ef97cf43c66f7e9dea57d0cddbd918e76bb409e8e7f6eb3675d021c475b8634 +92e875bf04e2492251cc0930e34ded40f95ec14484b829dfecbbdd54c31f3872
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.