diff for duplicates of <1387566560-23948-7-git-send-email-davidb@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 4e11f11..7eb12db 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,7 @@ index df18637..6ac9496 100644 clock-frequency = <19200000>; }; -+ timer@f9020000 { ++ timer at f9020000 { + #address-cells = <1>; + #size-cells = <1>; + ranges; @@ -24,7 +24,7 @@ index df18637..6ac9496 100644 + reg = <0xf9020000 0x1000>; + clock-frequency = <19200000>; + -+ frame@f9021000 { ++ frame at f9021000 { + frame-number = <0>; + interrupts = <0 8 0x4>, + <0 7 0x4>; @@ -32,42 +32,42 @@ index df18637..6ac9496 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>; @@ -75,7 +75,7 @@ index df18637..6ac9496 100644 + }; + }; + - restart@fc4ab000 { + restart at fc4ab000 { compatible = "qcom,pshold"; reg = <0xfc4ab000 0x4>; -- diff --git a/a/content_digest b/N1/content_digest index f013008..a4db4e1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,8 @@ "ref\01387566560-23948-1-git-send-email-davidb@codeaurora.org\0" - "From\0David Brown <davidb@codeaurora.org>\0" + "From\0davidb@codeaurora.org (David Brown)\0" "Subject\0[PATCH 6/7] ARM: dts: MSM8974: Add MMIO architected timer node\0" "Date\0Fri, 20 Dec 2013 11:09:19 -0800\0" - "To\0arm@kernel.org\0" - "Cc\0Stephen Boyd <sboyd@codeaurora.org>" - linux-kernel@vger.kernel.org - linux-arm-msm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " David Brown <davidb@codeaurora.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Stephen Boyd <sboyd@codeaurora.org>\n" @@ -28,7 +23,7 @@ " \t\t\tclock-frequency = <19200000>;\n" " \t\t};\n" " \n" - "+\t\ttimer@f9020000 {\n" + "+\t\ttimer at f9020000 {\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges;\n" @@ -36,7 +31,7 @@ "+\t\t\treg = <0xf9020000 0x1000>;\n" "+\t\t\tclock-frequency = <19200000>;\n" "+\n" - "+\t\t\tframe@f9021000 {\n" + "+\t\t\tframe at f9021000 {\n" "+\t\t\t\tframe-number = <0>;\n" "+\t\t\t\tinterrupts = <0 8 0x4>,\n" "+\t\t\t\t\t <0 7 0x4>;\n" @@ -44,42 +39,42 @@ "+\t\t\t\t <0xf9022000 0x1000>;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tframe@f9023000 {\n" + "+\t\t\tframe at f9023000 {\n" "+\t\t\t\tframe-number = <1>;\n" "+\t\t\t\tinterrupts = <0 9 0x4>;\n" "+\t\t\t\treg = <0xf9023000 0x1000>;\n" "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tframe@f9024000 {\n" + "+\t\t\tframe at f9024000 {\n" "+\t\t\t\tframe-number = <2>;\n" "+\t\t\t\tinterrupts = <0 10 0x4>;\n" "+\t\t\t\treg = <0xf9024000 0x1000>;\n" "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tframe@f9025000 {\n" + "+\t\t\tframe at f9025000 {\n" "+\t\t\t\tframe-number = <3>;\n" "+\t\t\t\tinterrupts = <0 11 0x4>;\n" "+\t\t\t\treg = <0xf9025000 0x1000>;\n" "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tframe@f9026000 {\n" + "+\t\t\tframe at f9026000 {\n" "+\t\t\t\tframe-number = <4>;\n" "+\t\t\t\tinterrupts = <0 12 0x4>;\n" "+\t\t\t\treg = <0xf9026000 0x1000>;\n" "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tframe@f9027000 {\n" + "+\t\t\tframe at f9027000 {\n" "+\t\t\t\tframe-number = <5>;\n" "+\t\t\t\tinterrupts = <0 13 0x4>;\n" "+\t\t\t\treg = <0xf9027000 0x1000>;\n" "+\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tframe@f9028000 {\n" + "+\t\t\tframe at f9028000 {\n" "+\t\t\t\tframe-number = <6>;\n" "+\t\t\t\tinterrupts = <0 14 0x4>;\n" "+\t\t\t\treg = <0xf9028000 0x1000>;\n" @@ -87,11 +82,11 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\trestart@fc4ab000 {\n" + " \t\trestart at fc4ab000 {\n" " \t\t\tcompatible = \"qcom,pshold\";\n" " \t\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 -c33955effac71f2773fa6b92f9f6bb0eb310c9ec3286c3c5bc26d9b64fe6f7b4 +05607695783e49f565aaa78b82b70f9949b2d19d0a90abb2633e80c1a902db22
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.