diff for duplicates of <20170505220115.143025-16-maxims@google.com> diff --git a/a/1.txt b/N1/1.txt index c628ed3..aa7e88e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,41 +24,41 @@ index f826646095..7f80bad7d0 100644 u-boot,dm-pre-reloc; + }; -- timer: timer@1e782000 { +- timer: timer at 1e782000 { - u-boot,dm-pre-reloc; - }; + }; +}; -- uart1: serial@1e783000 { +- uart1: serial at 1e783000 { - clocks = <&scu PCLK_UART1>; - }; +&uart1 { + clocks = <&scu PCLK_UART1>; +}; -- uart2: serial@1e78d000 { +- uart2: serial at 1e78d000 { - clocks = <&scu PCLK_UART2>; - }; +&uart2 { + clocks = <&scu PCLK_UART2>; +}; -- uart3: serial@1e78e000 { +- uart3: serial at 1e78e000 { - clocks = <&scu PCLK_UART3>; - }; +&uart3 { + clocks = <&scu PCLK_UART3>; +}; -- uart4: serial@1e78f000 { +- uart4: serial at 1e78f000 { - clocks = <&scu PCLK_UART4>; - }; +&uart4 { + clocks = <&scu PCLK_UART4>; +}; -- uart5: serial@1e784000 { +- uart5: serial at 1e784000 { - clocks = <&scu PCLK_UART5>; - }; - }; diff --git a/a/content_digest b/N1/content_digest index de9e249..79cfa04 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 15/15] aspeed: Cleanup ast2500-u-boot.dtsi Device Tree\0" + "Subject\0[U-Boot] [PATCH v2 15/15] aspeed: Cleanup ast2500-u-boot.dtsi Device Tree\0" "Date\0Fri, 5 May 2017 15:01:15 -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" "Remove unnecessary apb and ahb nodes and just override necessary\n" @@ -36,41 +32,41 @@ " \t\t\tu-boot,dm-pre-reloc;\n" "+\t\t};\n" " \n" - "-\t\t\ttimer: timer@1e782000 {\n" + "-\t\t\ttimer: timer at 1e782000 {\n" "-\t\t\t\tu-boot,dm-pre-reloc;\n" "-\t\t\t};\n" "+\t};\n" "+};\n" " \n" - "-\t\t\tuart1: serial@1e783000 {\n" + "-\t\t\tuart1: serial at 1e783000 {\n" "-\t\t\t\tclocks = <&scu PCLK_UART1>;\n" "-\t\t\t};\n" "+&uart1 {\n" "+\tclocks = <&scu PCLK_UART1>;\n" "+};\n" " \n" - "-\t\t\tuart2: serial@1e78d000 {\n" + "-\t\t\tuart2: serial at 1e78d000 {\n" "-\t\t\t\tclocks = <&scu PCLK_UART2>;\n" "-\t\t\t};\n" "+&uart2 {\n" "+\tclocks = <&scu PCLK_UART2>;\n" "+};\n" " \n" - "-\t\t\tuart3: serial@1e78e000 {\n" + "-\t\t\tuart3: serial at 1e78e000 {\n" "-\t\t\t\tclocks = <&scu PCLK_UART3>;\n" "-\t\t\t};\n" "+&uart3 {\n" "+\tclocks = <&scu PCLK_UART3>;\n" "+};\n" " \n" - "-\t\t\tuart4: serial@1e78f000 {\n" + "-\t\t\tuart4: serial at 1e78f000 {\n" "-\t\t\t\tclocks = <&scu PCLK_UART4>;\n" "-\t\t\t};\n" "+&uart4 {\n" "+\tclocks = <&scu PCLK_UART4>;\n" "+};\n" " \n" - "-\t\t\tuart5: serial@1e784000 {\n" + "-\t\t\tuart5: serial at 1e784000 {\n" "-\t\t\t\tclocks = <&scu PCLK_UART5>;\n" "-\t\t\t};\n" "-\t\t};\n" @@ -87,4 +83,4 @@ "-- \n" 2.13.0.rc1.294.g07d810a77f-goog -6239399beb6c057dabefc09fcd854f6def4d01d82bd2a8b375968d7182eb436a +f4683e809d52ce4ed96b22da8bf266d55fd3693155b2a2edfc4d1b3fe4fe671c
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.