diff for duplicates of <1521642012-9770-2-git-send-email-dinguyen@kernel.org> diff --git a/a/1.txt b/N1/1.txt index b3906df..1fb73d2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,9 +41,9 @@ index c89d0c30..0e267c8 100644 interrupt-parent = <&intc>; ranges = <0 0 0 0xffffffff>; -- clkmgr@ffd1000 { +- clkmgr at ffd1000 { - compatible = "altr,clk-mgr"; -+ clkmgr: clock-controller@ffd10000 { ++ clkmgr: clock-controller at ffd10000 { + compatible = "intel,stratix10-clkmgr"; reg = <0xffd10000 0x1000>; + #clock-cells = <1>; @@ -71,7 +71,7 @@ index c89d0c30..0e267c8 100644 + }; }; - gmac0: ethernet@ff800000 { + gmac0: ethernet at ff800000 { @@ -105,6 +129,8 @@ mac-address = [00 00 00 00 00 00]; resets = <&rst EMAC0_RESET>; @@ -117,7 +117,7 @@ index c89d0c30..0e267c8 100644 + clock-names = "timer"; }; - timer1: timer1@ffc03100 { + timer1: timer1 at ffc03100 { compatible = "snps,dw-apb-timer"; interrupts = <0 114 4>; reg = <0xffc03100 0x100>; @@ -125,7 +125,7 @@ index c89d0c30..0e267c8 100644 + clock-names = "timer"; }; - timer2: timer2@ffd00000 { + timer2: timer2 at ffd00000 { compatible = "snps,dw-apb-timer"; interrupts = <0 115 4>; reg = <0xffd00000 0x100>; @@ -133,7 +133,7 @@ index c89d0c30..0e267c8 100644 + clock-names = "timer"; }; - timer3: timer3@ffd00100 { + timer3: timer3 at ffd00100 { compatible = "snps,dw-apb-timer"; interrupts = <0 116 4>; reg = <0xffd00100 0x100>; @@ -141,7 +141,7 @@ index c89d0c30..0e267c8 100644 + clock-names = "timer"; }; - uart0: serial0@ffc02000 { + uart0: serial0 at ffc02000 { @@ -315,6 +356,7 @@ reg-shift = <2>; reg-io-width = <4>; diff --git a/a/content_digest b/N1/content_digest index b2f2fc5..3159c95 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,8 @@ "ref\01521642012-9770-1-git-send-email-dinguyen@kernel.org\0" - "From\0Dinh Nguyen <dinguyen@kernel.org>\0" + "From\0dinguyen@kernel.org (Dinh Nguyen)\0" "Subject\0[PATCHv7 2/3] arm64: dts: stratix10: use clock bindings for the Stratix10 platform\0" "Date\0Wed, 21 Mar 2018 09:20:11 -0500\0" - "To\0sboyd@kernel.org\0" - "Cc\0dinguyen@kernel.org" - mturquette@baylibre.com - robh+dt@kernel.org - mark.rutland@arm.com - catalin.marinas@arm.com - will.deacon@arm.com - linux-clk@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Use the clock bindings for the Stratix10 SoC. This includes changing the old\n" @@ -56,9 +48,9 @@ " \t\tinterrupt-parent = <&intc>;\n" " \t\tranges = <0 0 0 0xffffffff>;\n" " \n" - "-\t\tclkmgr@ffd1000 {\n" + "-\t\tclkmgr at ffd1000 {\n" "-\t\t\tcompatible = \"altr,clk-mgr\";\n" - "+\t\tclkmgr: clock-controller@ffd10000 {\n" + "+\t\tclkmgr: clock-controller at ffd10000 {\n" "+\t\t\tcompatible = \"intel,stratix10-clkmgr\";\n" " \t\t\treg = <0xffd10000 0x1000>;\n" "+\t\t\t#clock-cells = <1>;\n" @@ -86,7 +78,7 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\tgmac0: ethernet@ff800000 {\n" + " \t\tgmac0: ethernet at ff800000 {\n" "@@ -105,6 +129,8 @@\n" " \t\t\tmac-address = [00 00 00 00 00 00];\n" " \t\t\tresets = <&rst EMAC0_RESET>;\n" @@ -132,7 +124,7 @@ "+\t\t\tclock-names = \"timer\";\n" " \t\t};\n" " \n" - " \t\ttimer1: timer1@ffc03100 {\n" + " \t\ttimer1: timer1 at ffc03100 {\n" " \t\t\tcompatible = \"snps,dw-apb-timer\";\n" " \t\t\tinterrupts = <0 114 4>;\n" " \t\t\treg = <0xffc03100 0x100>;\n" @@ -140,7 +132,7 @@ "+\t\t\tclock-names = \"timer\";\n" " \t\t};\n" " \n" - " \t\ttimer2: timer2@ffd00000 {\n" + " \t\ttimer2: timer2 at ffd00000 {\n" " \t\t\tcompatible = \"snps,dw-apb-timer\";\n" " \t\t\tinterrupts = <0 115 4>;\n" " \t\t\treg = <0xffd00000 0x100>;\n" @@ -148,7 +140,7 @@ "+\t\t\tclock-names = \"timer\";\n" " \t\t};\n" " \n" - " \t\ttimer3: timer3@ffd00100 {\n" + " \t\ttimer3: timer3 at ffd00100 {\n" " \t\t\tcompatible = \"snps,dw-apb-timer\";\n" " \t\t\tinterrupts = <0 116 4>;\n" " \t\t\treg = <0xffd00100 0x100>;\n" @@ -156,7 +148,7 @@ "+\t\t\tclock-names = \"timer\";\n" " \t\t};\n" " \n" - " \t\tuart0: serial0@ffc02000 {\n" + " \t\tuart0: serial0 at ffc02000 {\n" "@@ -315,6 +356,7 @@\n" " \t\t\treg-shift = <2>;\n" " \t\t\treg-io-width = <4>;\n" @@ -195,4 +187,4 @@ "-- \n" 2.7.4 -7ff35efe1232e8134437e2bcbe0485f130738aa4739b87306b280fb922aa31dc +a4273e6414b34b7a35bb6622bc2cb8450589529ea3c0ac2507ee86456275d552
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.