diff for duplicates of <1422396644-21714-5-git-send-email-agross@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 6ec9f2c..6e0d17f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ index 63b2146..e47358d 100644 @@ -119,7 +119,7 @@ }; - gsbi2: gsbi@12480000 { + gsbi2: gsbi at 12480000 { - compatible = "qcom,gsbi-v1.0.0"; + compatible = "qcom,gsbi-ipq8064"; reg = <0x12480000 0x100>; @@ -26,13 +26,13 @@ index 63b2146..e47358d 100644 + qcom,gsbi-num = <2>; + syscon-tcsr = <&tcsr>; + - serial@12490000 { + serial at 12490000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x12490000 0x1000>, @@ -154,7 +157,7 @@ }; - gsbi4: gsbi@16300000 { + gsbi4: gsbi at 16300000 { - compatible = "qcom,gsbi-v1.0.0"; + compatible = "qcom,gsbi-ipq8064"; reg = <0x16300000 0x100>; @@ -45,13 +45,13 @@ index 63b2146..e47358d 100644 + qcom,gsbi-num = <4>; + syscon-tcsr = <&tcsr>; + - serial@16340000 { + serial at 16340000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16340000 0x1000>, @@ -188,7 +194,7 @@ }; - gsbi5: gsbi@1a200000 { + gsbi5: gsbi at 1a200000 { - compatible = "qcom,gsbi-v1.0.0"; + compatible = "qcom,gsbi-ipq8064"; reg = <0x1a200000 0x100>; @@ -64,7 +64,7 @@ index 63b2146..e47358d 100644 + qcom,gsbi-num = <5>; + syscon-tcsr = <&tcsr>; + - serial@1a240000 { + serial at 1a240000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x1a240000 0x1000>, @@ -279,5 +288,10 @@ @@ -72,7 +72,7 @@ index 63b2146..e47358d 100644 #reset-cells = <1>; }; + -+ tcsr: syscon@1a400000 { ++ tcsr: syscon at 1a400000 { + compatible = "qcom,tcsr-ipq8064", "syscon"; + reg = <0x1a400000 0x100>; + }; diff --git a/a/content_digest b/N1/content_digest index 39cbfab..c205164 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 4/6] ARM: DT: ipq8064: Add TCSR support\0" "Date\0Tue, 27 Jan 2015 16:10:42 -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 @@ "@@ -119,7 +119,7 @@\n" " \t\t};\n" " \n" - " \t\tgsbi2: gsbi@12480000 {\n" + " \t\tgsbi2: gsbi at 12480000 {\n" "-\t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "+\t\t\tcompatible = \"qcom,gsbi-ipq8064\";\n" " \t\t\treg = <0x12480000 0x100>;\n" @@ -40,13 +33,13 @@ "+\t\t\tqcom,gsbi-num = <2>;\n" "+\t\t\tsyscon-tcsr = <&tcsr>;\n" "+\n" - " \t\t\tserial@12490000 {\n" + " \t\t\tserial at 12490000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x12490000 0x1000>,\n" "@@ -154,7 +157,7 @@\n" " \t\t};\n" " \n" - " \t\tgsbi4: gsbi@16300000 {\n" + " \t\tgsbi4: gsbi at 16300000 {\n" "-\t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "+\t\t\tcompatible = \"qcom,gsbi-ipq8064\";\n" " \t\t\treg = <0x16300000 0x100>;\n" @@ -59,13 +52,13 @@ "+\t\t\tqcom,gsbi-num = <4>;\n" "+\t\t\tsyscon-tcsr = <&tcsr>;\n" "+\n" - " \t\t\tserial@16340000 {\n" + " \t\t\tserial at 16340000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x16340000 0x1000>,\n" "@@ -188,7 +194,7 @@\n" " \t\t};\n" " \n" - " \t\tgsbi5: gsbi@1a200000 {\n" + " \t\tgsbi5: gsbi at 1a200000 {\n" "-\t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "+\t\t\tcompatible = \"qcom,gsbi-ipq8064\";\n" " \t\t\treg = <0x1a200000 0x100>;\n" @@ -78,7 +71,7 @@ "+\t\t\tqcom,gsbi-num = <5>;\n" "+\t\t\tsyscon-tcsr = <&tcsr>;\n" "+\n" - " \t\t\tserial@1a240000 {\n" + " \t\t\tserial at 1a240000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x1a240000 0x1000>,\n" "@@ -279,5 +288,10 @@\n" @@ -86,7 +79,7 @@ " \t\t\t#reset-cells = <1>;\n" " \t\t};\n" "+\n" - "+\t\ttcsr: syscon@1a400000 {\n" + "+\t\ttcsr: syscon at 1a400000 {\n" "+\t\t\tcompatible = \"qcom,tcsr-ipq8064\", \"syscon\";\n" "+\t\t\treg = <0x1a400000 0x100>;\n" "+\t\t};\n" @@ -96,4 +89,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" hosted by The Linux Foundation -df93c7d54d9ba0bf2eedddd13b0409cfc144f6bea266e044667af0e3e68802b0 +413bc80875df1dfdf790f5263482f8d0ac9311a9bf51c7eddd735ba5a208b6a4
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.