diff for duplicates of <20180624174134.20581-1-daniel@zonque.org> diff --git a/a/1.txt b/N1/1.txt index a1e80fb..5853958 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,8 +16,8 @@ index 74c9ba6c2823..efd3fb1f68d2 100644 /* upstream device */ -- ssp0: ssp at 41000000 { -+ ssp1: ssp at 41000000 { +- ssp0: ssp@41000000 { ++ ssp1: ssp@41000000 { compatible = "mrvl,pxa3xx-ssp"; reg = <0x41000000 0x40>; interrupts = <24>; @@ -29,7 +29,7 @@ index 74c9ba6c2823..efd3fb1f68d2 100644 /* DAI as user */ - ssp_dai0: ssp_dai at 0 { + ssp_dai0: ssp_dai@0 { compatible = "mrvl,pxa-ssp-dai"; - port = <&ssp0>; + port = <&ssp1>; @@ -45,7 +45,7 @@ index 132a3b8ab148..3851057bc77d 100644 status = "disabled"; }; + -+ ssp1: ssp at 41000000 { ++ ssp1: ssp@41000000 { + compatible = "mrvl,pxa3xx-ssp"; + reg = <0x41000000 0x40>; + interrupts = <24>; @@ -53,7 +53,7 @@ index 132a3b8ab148..3851057bc77d 100644 + status = "disabled"; + }; + -+ ssp2: ssp at 41700000 { ++ ssp2: ssp@41700000 { + compatible = "mrvl,pxa3xx-ssp"; + reg = <0x41700000 0x40>; + interrupts = <16>; @@ -61,7 +61,7 @@ index 132a3b8ab148..3851057bc77d 100644 + status = "disabled"; + }; + -+ ssp3: ssp at 41900000 { ++ ssp3: ssp@41900000 { + compatible = "mrvl,pxa3xx-ssp"; + reg = <0x41900000 0x40>; + interrupts = <0>; @@ -69,7 +69,7 @@ index 132a3b8ab148..3851057bc77d 100644 + status = "disabled"; + }; + -+ ssp4: ssp at 41a00000 { ++ ssp4: ssp@41a00000 { + compatible = "mrvl,pxa3xx-ssp"; + reg = <0x41a00000 0x40>; + interrupts = <13>; diff --git a/a/content_digest b/N1/content_digest index 482dfc8..0f3b5db 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,12 @@ - "From\0daniel@zonque.org (Daniel Mack)\0" + "From\0Daniel Mack <daniel@zonque.org>\0" "Subject\0[PATCH] arm: dts: pxa3xx: Add ssp ports to pxa3xx device tree\0" "Date\0Sun, 24 Jun 2018 19:41:34 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0robert.jarzmik@free.fr" + " haojian.zhuang@gmail.com\0" + "Cc\0devicetree@vger.kernel.org" + robh+dt@kernel.org + Daniel Mack <daniel@zonque.org> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Also fix the documentation for these bindings.\n" @@ -22,8 +27,8 @@ " \n" " \t/* upstream device */\n" " \n" - "-\tssp0: ssp at 41000000 {\n" - "+\tssp1: ssp at 41000000 {\n" + "-\tssp0: ssp@41000000 {\n" + "+\tssp1: ssp@41000000 {\n" " \t\tcompatible = \"mrvl,pxa3xx-ssp\";\n" " \t\treg = <0x41000000 0x40>;\n" " \t\tinterrupts = <24>;\n" @@ -35,7 +40,7 @@ " \n" " \t/* DAI as user */\n" " \n" - " \tssp_dai0: ssp_dai at 0 {\n" + " \tssp_dai0: ssp_dai@0 {\n" " \t\tcompatible = \"mrvl,pxa-ssp-dai\";\n" "-\t\tport = <&ssp0>;\n" "+\t\tport = <&ssp1>;\n" @@ -51,7 +56,7 @@ " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" "+\n" - "+\t\tssp1: ssp at 41000000 {\n" + "+\t\tssp1: ssp@41000000 {\n" "+\t\t\tcompatible = \"mrvl,pxa3xx-ssp\";\n" "+\t\t\treg = <0x41000000 0x40>;\n" "+\t\t\tinterrupts = <24>;\n" @@ -59,7 +64,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tssp2: ssp at 41700000 {\n" + "+\t\tssp2: ssp@41700000 {\n" "+\t\t\tcompatible = \"mrvl,pxa3xx-ssp\";\n" "+\t\t\treg = <0x41700000 0x40>;\n" "+\t\t\tinterrupts = <16>;\n" @@ -67,7 +72,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tssp3: ssp at 41900000 {\n" + "+\t\tssp3: ssp@41900000 {\n" "+\t\t\tcompatible = \"mrvl,pxa3xx-ssp\";\n" "+\t\t\treg = <0x41900000 0x40>;\n" "+\t\t\tinterrupts = <0>;\n" @@ -75,7 +80,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tssp4: ssp at 41a00000 {\n" + "+\t\tssp4: ssp@41a00000 {\n" "+\t\t\tcompatible = \"mrvl,pxa3xx-ssp\";\n" "+\t\t\treg = <0x41a00000 0x40>;\n" "+\t\t\tinterrupts = <13>;\n" @@ -88,4 +93,4 @@ "-- \n" 2.17.1 -913c23c0c5f7405c5ad2ddf7094f96bdd31c5d3b98b474983bd00a2f17c9e21b +38a43298d0c9129eabadd53e849e3e59e35d9eca43db4d5e3e7826d24e52b5f5
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.