diff for duplicates of <1479144724-14231-2-git-send-email-bgolaszewski@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 8672467..30fa16b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,21 +15,26 @@ index 1bb1f6d..1635218 100644 status = "disabled"; }; + -+ mstpri: mstpri at 14110 { ++ mstpri: mstpri@14110 { + compatible = "ti,da850-mstpri"; + reg = <0x14110 0x0c>; + }; }; - aemif: aemif at 68000000 { + aemif: aemif@68000000 { compatible = "ti,da850-aemif"; @@ -451,4 +456,8 @@ 1 0 0x68000000 0x00008000>; status = "disabled"; }; -+ ddrctl: ddrctl at b0000000 { ++ ddrctl: ddrctl@b0000000 { + compatible = "ti,da850-ddr-controller"; + reg = <0xb0000000 0xe8>; + }; }; -- 2.9.3 + +_______________________________________________ +dri-devel mailing list +dri-devel@lists.freedesktop.org +https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/a/content_digest b/N1/content_digest index 0fec558..408c224 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,23 @@ "ref\01479144724-14231-1-git-send-email-bgolaszewski@baylibre.com\0" - "From\0bgolaszewski@baylibre.com (Bartosz Golaszewski)\0" + "From\0Bartosz Golaszewski <bgolaszewski@baylibre.com>\0" "Subject\0[PATCH 1/2] ARM: dts: da850: add the mstpri and ddrctl nodes\0" "Date\0Mon, 14 Nov 2016 18:32:03 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Kevin Hilman <khilman@baylibre.com>" + Michael Turquette <mturquette@baylibre.com> + Sekhar Nori <nsekhar@ti.com> + Rob Herring <robh+dt@kernel.org> + Frank Rowand <frowand.list@gmail.com> + Mark Rutland <mark.rutland@arm.com> + Peter Ujfalusi <peter.ujfalusi@ti.com> + " Russell King <linux@armlinux.org.uk>\0" + "Cc\0linux-devicetree <devicetree@vger.kernel.org>" + LKML <linux-kernel@vger.kernel.org> + linux-drm <dri-devel@lists.freedesktop.org> + Bartosz Golaszewski <bgolaszewski@baylibre.com> + Tomi Valkeinen <tomi.valkeinen@ti.com> + Jyri Sarha <jsarha@ti.com> + arm-soc <linux-arm-kernel@lists.infradead.org> + " Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "\00:1\0" "b\0" "Add the nodes for the MSTPRI configuration and DDR2/mDDR memory\n" @@ -22,23 +37,28 @@ " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" "+\n" - "+\t\tmstpri: mstpri at 14110 {\n" + "+\t\tmstpri: mstpri@14110 {\n" "+\t\t\tcompatible = \"ti,da850-mstpri\";\n" "+\t\t\treg = <0x14110 0x0c>;\n" "+\t\t};\n" " \t};\n" - " \taemif: aemif at 68000000 {\n" + " \taemif: aemif@68000000 {\n" " \t\tcompatible = \"ti,da850-aemif\";\n" "@@ -451,4 +456,8 @@\n" " \t\t\t 1 0 0x68000000 0x00008000>;\n" " \t\tstatus = \"disabled\";\n" " \t};\n" - "+\tddrctl: ddrctl at b0000000 {\n" + "+\tddrctl: ddrctl@b0000000 {\n" "+\t\tcompatible = \"ti,da850-ddr-controller\";\n" "+\t\treg = <0xb0000000 0xe8>;\n" "+\t};\n" " };\n" "-- \n" - 2.9.3 + "2.9.3\n" + "\n" + "_______________________________________________\n" + "dri-devel mailing list\n" + "dri-devel@lists.freedesktop.org\n" + https://lists.freedesktop.org/mailman/listinfo/dri-devel -717030e5dd7dd0a49fc8fa2c39975f764b21c000c339606d321b8fcd81c58f62 +7026b18570dcafcf75e48aab18a7ba5a99bb8e0f9db2732af28b196c85680d00
diff --git a/a/1.txt b/N2/1.txt index 8672467..fecc92a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,18 +15,18 @@ index 1bb1f6d..1635218 100644 status = "disabled"; }; + -+ mstpri: mstpri at 14110 { ++ mstpri: mstpri@14110 { + compatible = "ti,da850-mstpri"; + reg = <0x14110 0x0c>; + }; }; - aemif: aemif at 68000000 { + aemif: aemif@68000000 { compatible = "ti,da850-aemif"; @@ -451,4 +456,8 @@ 1 0 0x68000000 0x00008000>; status = "disabled"; }; -+ ddrctl: ddrctl at b0000000 { ++ ddrctl: ddrctl@b0000000 { + compatible = "ti,da850-ddr-controller"; + reg = <0xb0000000 0xe8>; + }; diff --git a/a/content_digest b/N2/content_digest index 0fec558..ad2f3b8 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,24 @@ "ref\01479144724-14231-1-git-send-email-bgolaszewski@baylibre.com\0" - "From\0bgolaszewski@baylibre.com (Bartosz Golaszewski)\0" + "From\0Bartosz Golaszewski <bgolaszewski@baylibre.com>\0" "Subject\0[PATCH 1/2] ARM: dts: da850: add the mstpri and ddrctl nodes\0" "Date\0Mon, 14 Nov 2016 18:32:03 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Kevin Hilman <khilman@baylibre.com>" + Michael Turquette <mturquette@baylibre.com> + Sekhar Nori <nsekhar@ti.com> + Rob Herring <robh+dt@kernel.org> + Frank Rowand <frowand.list@gmail.com> + Mark Rutland <mark.rutland@arm.com> + Peter Ujfalusi <peter.ujfalusi@ti.com> + " Russell King <linux@armlinux.org.uk>\0" + "Cc\0LKML <linux-kernel@vger.kernel.org>" + arm-soc <linux-arm-kernel@lists.infradead.org> + linux-drm <dri-devel@lists.freedesktop.org> + linux-devicetree <devicetree@vger.kernel.org> + Jyri Sarha <jsarha@ti.com> + Tomi Valkeinen <tomi.valkeinen@ti.com> + David Airlie <airlied@linux.ie> + Laurent Pinchart <laurent.pinchart@ideasonboard.com> + " Bartosz Golaszewski <bgolaszewski@baylibre.com>\0" "\00:1\0" "b\0" "Add the nodes for the MSTPRI configuration and DDR2/mDDR memory\n" @@ -22,18 +38,18 @@ " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" "+\n" - "+\t\tmstpri: mstpri at 14110 {\n" + "+\t\tmstpri: mstpri@14110 {\n" "+\t\t\tcompatible = \"ti,da850-mstpri\";\n" "+\t\t\treg = <0x14110 0x0c>;\n" "+\t\t};\n" " \t};\n" - " \taemif: aemif at 68000000 {\n" + " \taemif: aemif@68000000 {\n" " \t\tcompatible = \"ti,da850-aemif\";\n" "@@ -451,4 +456,8 @@\n" " \t\t\t 1 0 0x68000000 0x00008000>;\n" " \t\tstatus = \"disabled\";\n" " \t};\n" - "+\tddrctl: ddrctl at b0000000 {\n" + "+\tddrctl: ddrctl@b0000000 {\n" "+\t\tcompatible = \"ti,da850-ddr-controller\";\n" "+\t\treg = <0xb0000000 0xe8>;\n" "+\t};\n" @@ -41,4 +57,4 @@ "-- \n" 2.9.3 -717030e5dd7dd0a49fc8fa2c39975f764b21c000c339606d321b8fcd81c58f62 +1ca85244a896ef36adedf4fc1fa9ba34fb767ce96a8b8d1a27a24f7efe0ac742
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.