diff for duplicates of <1382045489-21075-4-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 1c386de..52617ae 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ index 5ac7701..3ac05eb 100644 }; }; -+ timer@f9020000 { ++ timer at f9020000 { + #address-cells = <1>; + #size-cells = <1>; + ranges; @@ -21,7 +21,7 @@ index 5ac7701..3ac05eb 100644 + reg = <0xf9020000 0x1000>; + clock-frequency = <19200000>; + -+ frame@f9021000 { ++ frame at f9021000 { + frame-number = <0>; + interrupts = <0 8 0x4>, + <0 7 0x4>; @@ -29,42 +29,42 @@ index 5ac7701..3ac05eb 100644 + <0xf9022000 0x1000>; + }; + -+ frame@f9023000 { ++ frame at f9023000 { + frame-number = <1>; + interrupts = <0 9 0x4>; + reg = <0xf9023000 0x1000>; + status = "disabled"; + }; + -+ frame@f9024000 { ++ frame at f9024000 { + frame-number = <2>; + interrupts = <0 10 0x4>; + reg = <0xf9024000 0x1000>; + status = "disabled"; + }; + -+ frame@f9025000 { ++ frame at f9025000 { + frame-number = <3>; + interrupts = <0 11 0x4>; + reg = <0xf9025000 0x1000>; + status = "disabled"; + }; + -+ frame@f9026000 { ++ frame at f9026000 { + frame-number = <4>; + interrupts = <0 12 0x4>; + reg = <0xf9026000 0x1000>; + status = "disabled"; + }; + -+ frame@f9027000 { ++ frame at f9027000 { + frame-number = <5>; + interrupts = <0 13 0x4>; + reg = <0xf9027000 0x1000>; + status = "disabled"; + }; + -+ frame@f9028000 { ++ frame at f9028000 { + frame-number = <6>; + interrupts = <0 14 0x4>; + reg = <0xf9028000 0x1000>; @@ -72,7 +72,7 @@ index 5ac7701..3ac05eb 100644 + }; + }; + - restart@fc4ab000 { + restart at fc4ab000 { compatible = "qcom,pshold"; reg = <0xfc4ab000 0x4>; -- diff --git a/a/content_digest b/N1/content_digest index 3ffac9e..9ceff0b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,9 @@ "ref\01382034310-31147-1-git-send-email-rvaswani@codeaurora.org\0" "ref\01382045489-21075-1-git-send-email-sboyd@codeaurora.org\0" - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" "Subject\0[PATCH 3/3] ARM: dts: MSM8974: Add MMIO architected timer node\0" "Date\0Thu, 17 Oct 2013 14:31:29 -0700\0" - "To\0David Brown <davidb@codeaurora.org>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-msm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " Rohit Vaswani <rvaswani@codeaurora.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the mmio architected timer node.\n" @@ -25,7 +21,7 @@ " \t\t};\n" " \t};\n" " \n" - "+\ttimer@f9020000 {\n" + "+\ttimer at f9020000 {\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" "+\t\tranges;\n" @@ -33,7 +29,7 @@ "+\t\treg = <0xf9020000 0x1000>;\n" "+\t\tclock-frequency = <19200000>;\n" "+\n" - "+\t\tframe@f9021000 {\n" + "+\t\tframe at f9021000 {\n" "+\t\t\tframe-number = <0>;\n" "+\t\t\tinterrupts = <0 8 0x4>,\n" "+\t\t\t\t <0 7 0x4>;\n" @@ -41,42 +37,42 @@ "+\t\t\t <0xf9022000 0x1000>;\n" "+\t\t};\n" "+\n" - "+\t\tframe@f9023000 {\n" + "+\t\tframe at f9023000 {\n" "+\t\t\tframe-number = <1>;\n" "+\t\t\tinterrupts = <0 9 0x4>;\n" "+\t\t\treg = <0xf9023000 0x1000>;\n" "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tframe@f9024000 {\n" + "+\t\tframe at f9024000 {\n" "+\t\t\tframe-number = <2>;\n" "+\t\t\tinterrupts = <0 10 0x4>;\n" "+\t\t\treg = <0xf9024000 0x1000>;\n" "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tframe@f9025000 {\n" + "+\t\tframe at f9025000 {\n" "+\t\t\tframe-number = <3>;\n" "+\t\t\tinterrupts = <0 11 0x4>;\n" "+\t\t\treg = <0xf9025000 0x1000>;\n" "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tframe@f9026000 {\n" + "+\t\tframe at f9026000 {\n" "+\t\t\tframe-number = <4>;\n" "+\t\t\tinterrupts = <0 12 0x4>;\n" "+\t\t\treg = <0xf9026000 0x1000>;\n" "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tframe@f9027000 {\n" + "+\t\tframe at f9027000 {\n" "+\t\t\tframe-number = <5>;\n" "+\t\t\tinterrupts = <0 13 0x4>;\n" "+\t\t\treg = <0xf9027000 0x1000>;\n" "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tframe@f9028000 {\n" + "+\t\tframe at f9028000 {\n" "+\t\t\tframe-number = <6>;\n" "+\t\t\tinterrupts = <0 14 0x4>;\n" "+\t\t\treg = <0xf9028000 0x1000>;\n" @@ -84,11 +80,11 @@ "+\t\t};\n" "+\t};\n" "+\n" - " \trestart@fc4ab000 {\n" + " \trestart at fc4ab000 {\n" " \t\tcompatible = \"qcom,pshold\";\n" " \t\treg = <0xfc4ab000 0x4>;\n" "-- \n" "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" hosted by The Linux Foundation -8adaca2a5cf8858416f443833dab0d352e387f899246a8182a1f80e0c581da68 +2a860f5b187e1d17e2288b96094ed9df33f357ba9517c82b842cc4554e923845
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.