diff for duplicates of <1363318299-10814-3-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 79dcf84..ae6dfaf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -67,7 +67,7 @@ index 8c5907b..c6ef8f1 100644 Example: -- timer@200a004 { +- timer at 200a004 { - compatible = "qcom,msm-gpt", "qcom,msm-timer"; - interrupts = <1 2 0x301>; - reg = <0x0200a004 0x10>; @@ -75,13 +75,13 @@ index 8c5907b..c6ef8f1 100644 - cpu-offset = <0x40000>; - }; - -- timer@200a024 { +- timer at 200a024 { - compatible = "qcom,msm-dgt", "qcom,msm-timer"; - interrupts = <1 3 0x301>; - reg = <0x0200a024 0x10>, - <0x0200a034 0x4>; - clock-frequency = <6750000>; -+ timer@200a000 { ++ timer at 200a000 { + compatible = "qcom,scss-timer", "qcom,msm-timer"; + interrupts = <1 1 0x301>, + <1 2 0x301>, @@ -98,7 +98,7 @@ index 31f2157..743ef42 100644 @@ -16,19 +16,13 @@ }; - timer@2000004 { + timer at 2000004 { - compatible = "qcom,msm-gpt", "qcom,msm-timer"; - interrupts = <1 1 0x301>; - reg = <0x02000004 0x10>; @@ -106,7 +106,7 @@ index 31f2157..743ef42 100644 - cpu-offset = <0x40000>; - }; - -- timer@2000024 { +- timer at 2000024 { - compatible = "qcom,msm-dgt", "qcom,msm-timer"; - interrupts = <1 0 0x301>; - reg = <0x02000024 0x10>, @@ -130,7 +130,7 @@ index 9e621b5..3ae51fb 100644 < 0x02002000 0x1000 >; }; -- timer@200a004 { +- timer at 200a004 { - compatible = "qcom,msm-gpt", "qcom,msm-timer"; - interrupts = <1 2 0x301>; - reg = <0x0200a004 0x10>; @@ -138,13 +138,13 @@ index 9e621b5..3ae51fb 100644 - cpu-offset = <0x80000>; - }; - -- timer@200a024 { +- timer at 200a024 { - compatible = "qcom,msm-dgt", "qcom,msm-timer"; - interrupts = <1 1 0x301>; - reg = <0x0200a024 0x10>, - <0x0200a034 0x4>; - clock-frequency = <6750000>; -+ timer@200a000 { ++ timer at 200a000 { + compatible = "qcom,kpss-timer", "qcom,msm-timer"; + interrupts = <1 1 0x301>, + <1 2 0x301>, diff --git a/a/content_digest b/N1/content_digest index 47572a7..2964ec1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,8 @@ "ref\01363318299-10814-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 2/3] ARM: msm: Rework timer binding to be more general\0" "Date\0Thu, 14 Mar 2013 20:31:38 -0700\0" - "To\0David Brown <davidb@codeaurora.org>" - Daniel Walker <dwalker@fifo99.com> - " Bryan Huntsman <bryanh@codeaurora.org>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-msm@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The msm timer binding I wrote is bad. First off, the clock\n" @@ -79,7 +74,7 @@ " \n" " Example:\n" " \n" - "- timer@200a004 {\n" + "- timer at 200a004 {\n" "- compatible = \"qcom,msm-gpt\", \"qcom,msm-timer\";\n" "- interrupts = <1 2 0x301>;\n" "- reg = <0x0200a004 0x10>;\n" @@ -87,13 +82,13 @@ "- cpu-offset = <0x40000>;\n" "- };\n" "-\n" - "- timer@200a024 {\n" + "- timer at 200a024 {\n" "- compatible = \"qcom,msm-dgt\", \"qcom,msm-timer\";\n" "- interrupts = <1 3 0x301>;\n" "- reg = <0x0200a024 0x10>,\n" "- <0x0200a034 0x4>;\n" "- clock-frequency = <6750000>;\n" - "+ timer@200a000 {\n" + "+ timer at 200a000 {\n" "+ compatible = \"qcom,scss-timer\", \"qcom,msm-timer\";\n" "+ interrupts = <1 1 0x301>,\n" "+ <1 2 0x301>,\n" @@ -110,7 +105,7 @@ "@@ -16,19 +16,13 @@\n" " \t};\n" " \n" - " \ttimer@2000004 {\n" + " \ttimer at 2000004 {\n" "-\t\tcompatible = \"qcom,msm-gpt\", \"qcom,msm-timer\";\n" "-\t\tinterrupts = <1 1 0x301>;\n" "-\t\treg = <0x02000004 0x10>;\n" @@ -118,7 +113,7 @@ "-\t\tcpu-offset = <0x40000>;\n" "-\t};\n" "-\n" - "-\ttimer@2000024 {\n" + "-\ttimer at 2000024 {\n" "-\t\tcompatible = \"qcom,msm-dgt\", \"qcom,msm-timer\";\n" "-\t\tinterrupts = <1 0 0x301>;\n" "-\t\treg = <0x02000024 0x10>,\n" @@ -142,7 +137,7 @@ " \t\t < 0x02002000 0x1000 >;\n" " \t};\n" " \n" - "-\ttimer@200a004 {\n" + "-\ttimer at 200a004 {\n" "-\t\tcompatible = \"qcom,msm-gpt\", \"qcom,msm-timer\";\n" "-\t\tinterrupts = <1 2 0x301>;\n" "-\t\treg = <0x0200a004 0x10>;\n" @@ -150,13 +145,13 @@ "-\t\tcpu-offset = <0x80000>;\n" "-\t};\n" "-\n" - "-\ttimer@200a024 {\n" + "-\ttimer at 200a024 {\n" "-\t\tcompatible = \"qcom,msm-dgt\", \"qcom,msm-timer\";\n" "-\t\tinterrupts = <1 1 0x301>;\n" "-\t\treg = <0x0200a024 0x10>,\n" "-\t\t <0x0200a034 0x4>;\n" "-\t\tclock-frequency = <6750000>;\n" - "+\ttimer@200a000 {\n" + "+\ttimer at 200a000 {\n" "+\t\tcompatible = \"qcom,kpss-timer\", \"qcom,msm-timer\";\n" "+\t\tinterrupts = <1 1 0x301>,\n" "+\t\t\t <1 2 0x301>,\n" @@ -332,4 +327,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" hosted by The Linux Foundation -eefb04186e0e608b1a8c124fd6f925881eaa7c24097f7d532964fdad4f3e8a51 +0272a0c69df1f23b11c478e36a693ec23667c73fb32f329745a900029a18d7f0
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.