diff for duplicates of <1422396644-21714-7-git-send-email-agross@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 91d9b1d..ddb96fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ index e1b0d5c..913a9f1 100644 @@ -121,7 +121,7 @@ }; - gsbi5: gsbi@16400000 { + gsbi5: gsbi at 16400000 { - compatible = "qcom,gsbi-v1.0.0"; + compatible = "qcom,gsbi-msm8960"; reg = <0x16400000 0x100>; @@ -26,7 +26,7 @@ index e1b0d5c..913a9f1 100644 + qcom,gsbi-num = <5>; + syscon-tcsr = <&tcsr>; + - serial@16440000 { + serial at 16440000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16440000 0x1000>, @@ -238,5 +241,10 @@ @@ -34,7 +34,7 @@ index e1b0d5c..913a9f1 100644 }; }; + -+ tcsr: syscon@1a400000 { ++ tcsr: syscon at 1a400000 { + compatible = "qcom,tcsr-msm8960", "syscon"; + reg = <0x1a400000 0x100>; + }; diff --git a/a/content_digest b/N1/content_digest index fce347d..4f84392 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,8 @@ "ref\01422396644-21714-1-git-send-email-agross@codeaurora.org\0" - "From\0Andy Gross <agross@codeaurora.org>\0" + "From\0agross@codeaurora.org (Andy Gross)\0" "Subject\0[PATCH 6/6] ARM: DT: msm8960: Add TCSR support\0" "Date\0Tue, 27 Jan 2015 16:10:44 -0600\0" - "To\0linux-arm-msm@vger.kernel.org\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - Bjorn Andersson <bjorn.andersson@sonymobile.com> - devicetree@vger.kernel.org - Kumar Gala <galak@codeaurora.org> - linux-soc@vger.kernel.org - " Andy Gross <agross@codeaurora.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This patch adds TCSR support for use by the GSBI to automatically configure ADM\n" @@ -27,7 +20,7 @@ "@@ -121,7 +121,7 @@\n" " \t\t};\n" " \n" - " \t\tgsbi5: gsbi@16400000 {\n" + " \t\tgsbi5: gsbi at 16400000 {\n" "-\t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "+\t\t\tcompatible = \"qcom,gsbi-msm8960\";\n" " \t\t\treg = <0x16400000 0x100>;\n" @@ -40,7 +33,7 @@ "+\t\t\tqcom,gsbi-num = <5>;\n" "+\t\t\tsyscon-tcsr = <&tcsr>;\n" "+\n" - " \t\t\tserial@16440000 {\n" + " \t\t\tserial at 16440000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x16440000 0x1000>,\n" "@@ -238,5 +241,10 @@\n" @@ -48,7 +41,7 @@ " \t\t\t};\n" " \t\t};\n" "+\n" - "+\t\ttcsr: syscon@1a400000 {\n" + "+\t\ttcsr: syscon at 1a400000 {\n" "+\t\t\tcompatible = \"qcom,tcsr-msm8960\", \"syscon\";\n" "+\t\t\treg = <0x1a400000 0x100>;\n" "+\t\t};\n" @@ -58,4 +51,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" hosted by The Linux Foundation -8eddcf6c176d09c9eb797f7a651c44ea677fa0bf6b0c48451773049ad4707cd4 +dcdf2e13e6363f76b338d9d80a7efa55da0f3fed9d557c0e32187e0fb3b88702
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.