diff for duplicates of <20180618145843.14631-18-paul.kocialkowski@bootlin.com> diff --git a/a/1.txt b/N1/1.txt index 8b1c73b..0595d39 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ pool has to be located in that area. Following Allwinner's decision in downstream software, the last 96 MiB of the first 256 MiB of RAM are reserved for this purpose. -Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> +Signed-off-by: Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org> diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index 6fa9e28edc59..3138f791b6b2 100644 @@ -23,7 +23,7 @@ index 6fa9e28edc59..3138f791b6b2 100644 + ranges; + + /* Address must be kept in the lower 256 MiBs of DRAM for VE. */ -+ cma_pool: cma at 4a000000 { ++ cma_pool: cma@4a000000 { + compatible = "shared-dma-pool"; + size = <0x6000000>; + alloc-ranges = <0x4a000000 0x6000000>; @@ -32,14 +32,14 @@ index 6fa9e28edc59..3138f791b6b2 100644 + }; + }; + - soc at 1c00000 { + soc@1c00000 { compatible = "simple-bus"; #address-cells = <1>; @@ -292,6 +307,19 @@ }; }; -+ vpu: video-codec at 1c0e000 { ++ vpu: video-codec@1c0e000 { + compatible = "allwinner,sun5i-a13-video-engine"; + reg = <0x01c0e000 0x1000>; + @@ -52,7 +52,7 @@ index 6fa9e28edc59..3138f791b6b2 100644 + allwinner,sram = <&ve_sram 1>; + }; + - mmc0: mmc at 1c0f000 { + mmc0: mmc@1c0f000 { compatible = "allwinner,sun5i-a13-mmc"; reg = <0x01c0f000 0x1000>; -- diff --git a/a/content_digest b/N1/content_digest index 92869e4..e660d13 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,34 @@ "ref\020180618145843.14631-1-paul.kocialkowski@bootlin.com\0" - "From\0paul.kocialkowski@bootlin.com (Paul Kocialkowski)\0" + "ref\020180618145843.14631-1-paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org\0" + "From\0Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>\0" "Subject\0[PATCH v4 17/19] ARM: dts: sun5i: Add Video Engine and reserved memory nodes\0" "Date\0Mon, 18 Jun 2018 16:58:41 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Cc\0Mauro Carvalho Chehab <mchehab-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org> + Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> + Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org> + Marco Franchi <marco.franchi-3arQi8VN3Tc@public.gmane.org> + Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org> + Hans Verkuil <hverkuil-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org> + Sylwester Nawrocki <s.nawrocki-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> + Tom Saeger <tom.saeger-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> + Smitha T Murthy <smitha.t-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> + Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + Andrzej Hajda <a.hajda-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> + Jonathan Corbet <corbet-T1hC0tSOHrs@public.gmane.org> + David S . Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> + Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> + Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> + Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Randy Dunlap <rdunlap-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> + Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> + " Stanimir Varbanov <stanimir.varbanov-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" "\00:1\0" "b\0" "This adds nodes for the Video Engine and the associated reserved memory\n" @@ -14,7 +40,7 @@ "downstream software, the last 96 MiB of the first 256 MiB of RAM are\n" "reserved for this purpose.\n" "\n" - "Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>\n" + "Signed-off-by: Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>\n" "\n" "diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi\n" "index 6fa9e28edc59..3138f791b6b2 100644\n" @@ -30,7 +56,7 @@ "+\t\tranges;\n" "+\n" "+\t\t/* Address must be kept in the lower 256 MiBs of DRAM for VE. */\n" - "+\t\tcma_pool: cma at 4a000000 {\n" + "+\t\tcma_pool: cma@4a000000 {\n" "+\t\t\tcompatible = \"shared-dma-pool\";\n" "+\t\t\tsize = <0x6000000>;\n" "+\t\t\talloc-ranges = <0x4a000000 0x6000000>;\n" @@ -39,14 +65,14 @@ "+\t\t};\n" "+\t};\n" "+\n" - " \tsoc at 1c00000 {\n" + " \tsoc@1c00000 {\n" " \t\tcompatible = \"simple-bus\";\n" " \t\t#address-cells = <1>;\n" "@@ -292,6 +307,19 @@\n" " \t\t\t};\n" " \t\t};\n" " \n" - "+\t\tvpu: video-codec at 1c0e000 {\n" + "+\t\tvpu: video-codec@1c0e000 {\n" "+\t\t\tcompatible = \"allwinner,sun5i-a13-video-engine\";\n" "+\t\t\treg = <0x01c0e000 0x1000>;\n" "+\n" @@ -59,10 +85,10 @@ "+\t\t\tallwinner,sram = <&ve_sram 1>;\n" "+\t\t};\n" "+\n" - " \t\tmmc0: mmc at 1c0f000 {\n" + " \t\tmmc0: mmc@1c0f000 {\n" " \t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" " \t\t\treg = <0x01c0f000 0x1000>;\n" "-- \n" 2.17.0 -5ab66e849ebe57fb29ecc278542ffc2e6c85b37db7775822b2154e500f346c3d +915d63a2e49ddff45c95f1372f203cd51eae4b3801a299d2213a961c313cd1e5
diff --git a/a/1.txt b/N2/1.txt index 8b1c73b..12353c2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -23,7 +23,7 @@ index 6fa9e28edc59..3138f791b6b2 100644 + ranges; + + /* Address must be kept in the lower 256 MiBs of DRAM for VE. */ -+ cma_pool: cma at 4a000000 { ++ cma_pool: cma@4a000000 { + compatible = "shared-dma-pool"; + size = <0x6000000>; + alloc-ranges = <0x4a000000 0x6000000>; @@ -32,14 +32,14 @@ index 6fa9e28edc59..3138f791b6b2 100644 + }; + }; + - soc at 1c00000 { + soc@1c00000 { compatible = "simple-bus"; #address-cells = <1>; @@ -292,6 +307,19 @@ }; }; -+ vpu: video-codec at 1c0e000 { ++ vpu: video-codec@1c0e000 { + compatible = "allwinner,sun5i-a13-video-engine"; + reg = <0x01c0e000 0x1000>; + @@ -52,7 +52,7 @@ index 6fa9e28edc59..3138f791b6b2 100644 + allwinner,sram = <&ve_sram 1>; + }; + - mmc0: mmc at 1c0f000 { + mmc0: mmc@1c0f000 { compatible = "allwinner,sun5i-a13-mmc"; reg = <0x01c0f000 0x1000>; -- diff --git a/a/content_digest b/N2/content_digest index 92869e4..bbdba20 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,50 @@ "ref\020180618145843.14631-1-paul.kocialkowski@bootlin.com\0" - "From\0paul.kocialkowski@bootlin.com (Paul Kocialkowski)\0" + "From\0Paul Kocialkowski <paul.kocialkowski@bootlin.com>\0" "Subject\0[PATCH v4 17/19] ARM: dts: sun5i: Add Video Engine and reserved memory nodes\0" "Date\0Mon, 18 Jun 2018 16:58:41 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-media@vger.kernel.org" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" + "Cc\0Mauro Carvalho Chehab <mchehab@kernel.org>" + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + Maxime Ripard <maxime.ripard@bootlin.com> + Chen-Yu Tsai <wens@csie.org> + Paul Kocialkowski <paul.kocialkowski@bootlin.com> + Marco Franchi <marco.franchi@nxp.com> + Icenowy Zheng <icenowy@aosc.io> + Hans Verkuil <hverkuil@xs4all.nl> + Sylwester Nawrocki <s.nawrocki@samsung.com> + Tom Saeger <tom.saeger@oracle.com> + Smitha T Murthy <smitha.t@samsung.com> + Sakari Ailus <sakari.ailus@linux.intel.com> + Andrzej Hajda <a.hajda@samsung.com> + Jonathan Corbet <corbet@lwn.net> + David S . Miller <davem@davemloft.net> + Andrew Morton <akpm@linux-foundation.org> + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Linus Walleij <linus.walleij@linaro.org> + Randy Dunlap <rdunlap@infradead.org> + Arnd Bergmann <arnd@arndb.de> + Stanimir Varbanov <stanimir.varbanov@linaro.org> + Philipp Zabel <p.zabel@pengutronix.de> + Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> + Jacob Chen <jacob-chen@iotwrt.com> + Steve Longerbeam <slongerbeam@gmail.com> + Todor Tomov <todor.tomov@linaro.org> + Jacopo Mondi <jacopo+renesas@jmondi.org> + Alexandre Courbot <acourbot@chromium.org> + Marek Szyprowski <m.szyprowski@samsung.com> + Andy Shevchenko <andriy.shevchenko@linux.intel.com> + Tomasz Figa <tfiga@chromium.org> + Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> + Hans de Goede <hdegoede@redhat.com> + Sami Tolvanen <samitolvanen@google.com> + Thomas Petazzoni <thomas.petazzoni@bootlin.com> + linux-sunxi@googlegroups.com + Hugues Fruchet <hugues.fruchet@st.com> + " Randy Li <ayaka@soulik.info>\0" "\00:1\0" "b\0" "This adds nodes for the Video Engine and the associated reserved memory\n" @@ -30,7 +72,7 @@ "+\t\tranges;\n" "+\n" "+\t\t/* Address must be kept in the lower 256 MiBs of DRAM for VE. */\n" - "+\t\tcma_pool: cma at 4a000000 {\n" + "+\t\tcma_pool: cma@4a000000 {\n" "+\t\t\tcompatible = \"shared-dma-pool\";\n" "+\t\t\tsize = <0x6000000>;\n" "+\t\t\talloc-ranges = <0x4a000000 0x6000000>;\n" @@ -39,14 +81,14 @@ "+\t\t};\n" "+\t};\n" "+\n" - " \tsoc at 1c00000 {\n" + " \tsoc@1c00000 {\n" " \t\tcompatible = \"simple-bus\";\n" " \t\t#address-cells = <1>;\n" "@@ -292,6 +307,19 @@\n" " \t\t\t};\n" " \t\t};\n" " \n" - "+\t\tvpu: video-codec at 1c0e000 {\n" + "+\t\tvpu: video-codec@1c0e000 {\n" "+\t\t\tcompatible = \"allwinner,sun5i-a13-video-engine\";\n" "+\t\t\treg = <0x01c0e000 0x1000>;\n" "+\n" @@ -59,10 +101,10 @@ "+\t\t\tallwinner,sram = <&ve_sram 1>;\n" "+\t\t};\n" "+\n" - " \t\tmmc0: mmc at 1c0f000 {\n" + " \t\tmmc0: mmc@1c0f000 {\n" " \t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" " \t\t\treg = <0x01c0f000 0x1000>;\n" "-- \n" 2.17.0 -5ab66e849ebe57fb29ecc278542ffc2e6c85b37db7775822b2154e500f346c3d +e4b442e958accdfe7e31eb6fa1efd94c52413689f5bcee3967254a6723ece26a
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.