diff for duplicates of <20120912160710.GA21878@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index a8ad4c9..570f4c7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Wed, Sep 05, 2012 at 12:28:53PM -0700, Stephen Boyd wrote: > diff --git a/Documentation/devicetree/bindings/arm/msm/timer.txt b/Documentation/devicetree/bindings/arm/msm/timer.txt -> + timer@0200a004 { +> + timer at 0200a004 { > + compatible = "qcom,msm-gpt", "qcom,msm-timer"; > + interrupts = <1 2 0x301>; > + reg = <0x0200a004 0x10>; @@ -10,7 +10,7 @@ On Wed, Sep 05, 2012 at 12:28:53PM -0700, Stephen Boyd wrote: > + cpu-offset = <0x40000>; > + }; > + -> + timer@0200a024 { +> + timer at 0200a024 { > + compatible = "qcom,msm-dgt", "qcom,msm-timer"; > + interrupts = <1 3 0x301>; > + reg = <0x0200a024 0x10>, @@ -19,7 +19,7 @@ On Wed, Sep 05, 2012 at 12:28:53PM -0700, Stephen Boyd wrote: > + cpu-offset = <0x40000>; > + }; -The names should be timer@200a004 and timer@200a024, without the +The names should be timer at 200a004 and timer at 200a024, without the leading zero. If there are no other concerns, I can just fix these up when I pull the patch in. No need to resend. diff --git a/a/content_digest b/N1/content_digest index 0222397..24f7d0d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,16 @@ "ref\01346873339-10927-1-git-send-email-sboyd@codeaurora.org\0" "ref\01346873339-10927-4-git-send-email-sboyd@codeaurora.org\0" - "From\0David Brown <davidb@codeaurora.org>\0" - "Subject\0Re: [PATCH 3/9] ARM: msm: Add DT support to msm_timer\0" + "From\0davidb@codeaurora.org (David Brown)\0" + "Subject\0[PATCH 3/9] ARM: msm: Add DT support to msm_timer\0" "Date\0Wed, 12 Sep 2012 09:07:10 -0700\0" - "To\0Stephen Boyd <sboyd@codeaurora.org>\0" - "Cc\0Bryan Huntsman <bryanh@codeaurora.org>" - Daniel Walker <dwalker@fifo99.com> - linux-kernel@vger.kernel.org - linux-arm-msm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " devicetree-discuss@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Sep 05, 2012 at 12:28:53PM -0700, Stephen Boyd wrote:\n" "\n" "> diff --git a/Documentation/devicetree/bindings/arm/msm/timer.txt b/Documentation/devicetree/bindings/arm/msm/timer.txt\n" "\n" - "> + timer@0200a004 {\n" + "> + timer at 0200a004 {\n" "> + compatible = \"qcom,msm-gpt\", \"qcom,msm-timer\";\n" "> + interrupts = <1 2 0x301>;\n" "> + reg = <0x0200a004 0x10>;\n" @@ -24,7 +18,7 @@ "> + cpu-offset = <0x40000>;\n" "> + };\n" "> +\n" - "> + timer@0200a024 {\n" + "> + timer at 0200a024 {\n" "> + compatible = \"qcom,msm-dgt\", \"qcom,msm-timer\";\n" "> + interrupts = <1 3 0x301>;\n" "> + reg = <0x0200a024 0x10>,\n" @@ -33,7 +27,7 @@ "> + cpu-offset = <0x40000>;\n" "> + };\n" "\n" - "The names should be timer@200a004 and timer@200a024, without the\n" + "The names should be timer at 200a004 and timer at 200a024, without the\n" "leading zero. If there are no other concerns, I can just fix these up\n" "when I pull the patch in. No need to resend.\n" "\n" @@ -44,4 +38,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" hosted by The Linux Foundation -b8605d1c65196fcda3b5b61d9b4d8638d9f2aadbb69af4291251cdc22ef80ca9 +9998e7468cc8daec77e0c786850d50f663c79e004fe7a0a42b94526b8a8bdb51
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.