diff for duplicates of <20180511031930.419CC44007A@finisterre.ee.mobilebroadband>
diff --git a/a/content_digest b/N1/content_digest
index 969a5cd..c48ccea 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,23 +14,25 @@
"To\0Srinivas Kandagatla <srinivas.kandagatla\@linaro.org>\0"
]
[
- "Cc\0mark.rutland\@arm.com",
- " devicetree\@vger.kernel.org",
+ "Cc\0Mark Brown <broonie\@kernel.org>",
+ " andy.gross\@linaro.org",
+ " broonie\@kernel.org",
+ " linux-arm-msm\@vger.kernel.org",
" alsa-devel\@alsa-project.org",
+ " robh+dt\@kernel.org",
" bgoswami\@codeaurora.org",
+ " mark.rutland\@arm.com",
+ " devicetree\@vger.kernel.org",
" rohkumar\@qti.qualcomm.com",
- " linux-arm-msm\@vger.kernel.org",
+ " gregkh\@linuxfoundation.org",
" plai\@codeaurora.org",
- " spatakok\@qti.qualcomm.com",
- " linux-kernel\@vger.kernel.org",
" tiwai\@suse.com",
- " robh+dt\@kernel.org",
" lgirdwood\@gmail.com",
" david.brown\@linaro.org",
- " broonie\@kernel.org",
- " gregkh\@linuxfoundation.org",
- " andy.gross\@linaro.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ " linux-arm-kernel\@lists.infradead.org",
+ " spatakok\@qti.qualcomm.com",
+ " linux-kernel\@vger.kernel.org",
+ " alsa-devel\@alsa-project.org\0"
]
[
"\0000:1\0"
@@ -215,4 +217,4 @@
"2.17.0"
]
-ae106dc604ec7c14ba505ab5d0d89dfc6ab6d1f925fdc7cc8fbb99587fe714b6
+1c02e6b412311051730ad0ef8dbe2d720fe9644935f5b4dab732fde0b797667d
diff --git a/a/1.txt b/N2/1.txt
index 202b033..d596946 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -103,34 +103,34 @@ index 000000000000..bcc612cc7423
+The following example represents a QDSP based sound card on a MSM8996 device
+which uses apr as communication between Apps and QDSP.
+
-+ apr@4 {
++ apr at 4 {
+ compatible = "qcom,apr-v2";
+ reg = <APR_DOMAIN_ADSP>;
+
-+ q6core@3 {
++ q6core at 3 {
+ compatible = "qcom,q6core";
+ reg = <APR_SVC_ADSP_CORE>;
+ };
+
-+ q6afe@4 {
++ q6afe at 4 {
+ compatible = "qcom,q6afe";
+ reg = <APR_SVC_AFE>;
+
+ dais {
+ #sound-dai-cells = <1>;
-+ hdmi@1 {
++ hdmi at 1 {
+ reg = <1>;
+ };
+ };
+ };
+
-+ q6asm@7 {
++ q6asm at 7 {
+ compatible = "qcom,q6asm";
+ reg = <APR_SVC_ASM>;
+ ...
+ };
+
-+ q6adm@8 {
++ q6adm at 8 {
+ compatible = "qcom,q6adm";
+ reg = <APR_SVC_ADM>;
+ ...
diff --git a/a/content_digest b/N2/content_digest
index 969a5cd..c575a5b 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\00020180426094606.4775-2-srinivas.kandagatla\@linaro.org\0"
]
[
- "From\0Mark Brown <broonie\@kernel.org>\0"
+ "From\0broonie\@kernel.org (Mark Brown)\0"
]
[
"Subject\0Applied \"soc: qcom dt-bindings: Add APR bus bindings\" to the asoc tree\0"
@@ -11,26 +11,7 @@
"Date\0Fri, 11 May 2018 04:19:30 +0100 (BST)\0"
]
[
- "To\0Srinivas Kandagatla <srinivas.kandagatla\@linaro.org>\0"
-]
-[
- "Cc\0mark.rutland\@arm.com",
- " devicetree\@vger.kernel.org",
- " alsa-devel\@alsa-project.org",
- " bgoswami\@codeaurora.org",
- " rohkumar\@qti.qualcomm.com",
- " linux-arm-msm\@vger.kernel.org",
- " plai\@codeaurora.org",
- " spatakok\@qti.qualcomm.com",
- " linux-kernel\@vger.kernel.org",
- " tiwai\@suse.com",
- " robh+dt\@kernel.org",
- " lgirdwood\@gmail.com",
- " david.brown\@linaro.org",
- " broonie\@kernel.org",
- " gregkh\@linuxfoundation.org",
- " andy.gross\@linaro.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -144,34 +125,34 @@
"+The following example represents a QDSP based sound card on a MSM8996 device\n",
"+which uses apr as communication between Apps and QDSP.\n",
"+\n",
- "+\tapr\@4 {\n",
+ "+\tapr at 4 {\n",
"+\t\tcompatible = \"qcom,apr-v2\";\n",
"+\t\treg = <APR_DOMAIN_ADSP>;\n",
"+\n",
- "+\t\tq6core\@3 {\n",
+ "+\t\tq6core at 3 {\n",
"+\t\t\tcompatible = \"qcom,q6core\";\n",
"+\t\t\treg = <APR_SVC_ADSP_CORE>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tq6afe\@4 {\n",
+ "+\t\tq6afe at 4 {\n",
"+\t\t\tcompatible = \"qcom,q6afe\";\n",
"+\t\t\treg = <APR_SVC_AFE>;\n",
"+\n",
"+\t\t\tdais {\n",
"+\t\t\t\t#sound-dai-cells = <1>;\n",
- "+\t\t\t\thdmi\@1 {\n",
+ "+\t\t\t\thdmi at 1 {\n",
"+\t\t\t\t\treg = <1>;\n",
"+\t\t\t\t};\n",
"+\t\t\t};\n",
"+\t\t};\n",
"+\n",
- "+\t\tq6asm\@7 {\n",
+ "+\t\tq6asm at 7 {\n",
"+\t\t\tcompatible = \"qcom,q6asm\";\n",
"+\t\t\treg = <APR_SVC_ASM>;\n",
"+\t\t\t...\n",
"+\t\t};\n",
"+\n",
- "+\t\tq6adm\@8 {\n",
+ "+\t\tq6adm at 8 {\n",
"+\t\t\tcompatible = \"qcom,q6adm\";\n",
"+\t\t\treg = <APR_SVC_ADM>;\n",
"+\t\t\t...\n",
@@ -215,4 +196,4 @@
"2.17.0"
]
-ae106dc604ec7c14ba505ab5d0d89dfc6ab6d1f925fdc7cc8fbb99587fe714b6
+f0bd71f6e90c98901cba0c78a4dc67226a464b844ea2bd21a77de09dcc0a5223
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.