diff for duplicates of <20180618145843.14631-13-paul.kocialkowski@bootlin.com> diff --git a/a/1.txt b/N1/1.txt index 7ed56bc..7a51900 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,10 +1,10 @@ -From: Maxime Ripard <maxime.ripard@bootlin.com> +From: Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org> This adds a SRAM controller node for the A33, with support for the C1 SRAM region that is shared between the Video Engine and the CPU. -Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> -Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> +Signed-off-by: Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org> +Signed-off-by: Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org> diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index a21f2ed07a52..97a976b3b1ef 100644 @@ -13,22 +13,22 @@ index a21f2ed07a52..97a976b3b1ef 100644 @@ -204,6 +204,28 @@ }; - soc at 1c00000 { -+ sram-controller at 1c00000 { + soc@1c00000 { ++ sram-controller@1c00000 { + compatible = "allwinner,sun8i-a33-sram-controller"; + reg = <0x01c00000 0x30>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + -+ sram_c: sram at 1d00000 { ++ sram_c: sram@1d00000 { + compatible = "mmio-sram"; + reg = <0x01d00000 0xd00000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x01d00000 0xd00000>; + -+ ve_sram: sram-section at 0 { ++ ve_sram: sram-section@0 { + compatible = "allwinner,sun8i-a33-sram-c1", + "allwinner,sun4i-a10-sram-c1"; + reg = <0x000000 0x80000>; @@ -36,7 +36,7 @@ index a21f2ed07a52..97a976b3b1ef 100644 + }; + }; + - tcon0: lcd-controller at 1c0c000 { + tcon0: lcd-controller@1c0c000 { compatible = "allwinner,sun8i-a33-tcon"; reg = <0x01c0c000 0x1000>; -- diff --git a/a/content_digest b/N1/content_digest index 3afdccc..6f2f767 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,43 @@ "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 12/19] ARM: sun8i-a33: Add SRAM controller node and C1 SRAM region\0" "Date\0Mon, 18 Jun 2018 16:58:36 +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" - "From: Maxime Ripard <maxime.ripard@bootlin.com>\n" + "From: Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>\n" "\n" "This adds a SRAM controller node for the A33, with support for the C1\n" "SRAM region that is shared between the Video Engine and the CPU.\n" "\n" - "Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>\n" - "Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>\n" + "Signed-off-by: Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>\n" + "Signed-off-by: Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>\n" "\n" "diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi\n" "index a21f2ed07a52..97a976b3b1ef 100644\n" @@ -20,22 +46,22 @@ "@@ -204,6 +204,28 @@\n" " \t};\n" " \n" - " \tsoc at 1c00000 {\n" - "+\t\tsram-controller at 1c00000 {\n" + " \tsoc@1c00000 {\n" + "+\t\tsram-controller@1c00000 {\n" "+\t\t\tcompatible = \"allwinner,sun8i-a33-sram-controller\";\n" "+\t\t\treg = <0x01c00000 0x30>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\tsram_c: sram at 1d00000 {\n" + "+\t\t\tsram_c: sram@1d00000 {\n" "+\t\t\t\tcompatible = \"mmio-sram\";\n" "+\t\t\t\treg = <0x01d00000 0xd00000>;\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <1>;\n" "+\t\t\t\tranges = <0 0x01d00000 0xd00000>;\n" "+\n" - "+\t\t\t\tve_sram: sram-section at 0 {\n" + "+\t\t\t\tve_sram: sram-section@0 {\n" "+\t\t\t\t\tcompatible = \"allwinner,sun8i-a33-sram-c1\",\n" "+\t\t\t\t\t\t \"allwinner,sun4i-a10-sram-c1\";\n" "+\t\t\t\t\treg = <0x000000 0x80000>;\n" @@ -43,10 +69,10 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\ttcon0: lcd-controller at 1c0c000 {\n" + " \t\ttcon0: lcd-controller@1c0c000 {\n" " \t\t\tcompatible = \"allwinner,sun8i-a33-tcon\";\n" " \t\t\treg = <0x01c0c000 0x1000>;\n" "-- \n" 2.17.0 -518f36bbbfe4c49072f0630c39eae91065af570a7c44e635077023f4f676cea1 +75ff22116eb733477ea8718e657fc7bb94777bdb4400e189b7659f9953bae366
diff --git a/a/1.txt b/N2/1.txt index 7ed56bc..7ad626d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -13,22 +13,22 @@ index a21f2ed07a52..97a976b3b1ef 100644 @@ -204,6 +204,28 @@ }; - soc at 1c00000 { -+ sram-controller at 1c00000 { + soc@1c00000 { ++ sram-controller@1c00000 { + compatible = "allwinner,sun8i-a33-sram-controller"; + reg = <0x01c00000 0x30>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + -+ sram_c: sram at 1d00000 { ++ sram_c: sram@1d00000 { + compatible = "mmio-sram"; + reg = <0x01d00000 0xd00000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x01d00000 0xd00000>; + -+ ve_sram: sram-section at 0 { ++ ve_sram: sram-section@0 { + compatible = "allwinner,sun8i-a33-sram-c1", + "allwinner,sun4i-a10-sram-c1"; + reg = <0x000000 0x80000>; @@ -36,7 +36,7 @@ index a21f2ed07a52..97a976b3b1ef 100644 + }; + }; + - tcon0: lcd-controller at 1c0c000 { + tcon0: lcd-controller@1c0c000 { compatible = "allwinner,sun8i-a33-tcon"; reg = <0x01c0c000 0x1000>; -- diff --git a/a/content_digest b/N2/content_digest index 3afdccc..82eadb7 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 12/19] ARM: sun8i-a33: Add SRAM controller node and C1 SRAM region\0" "Date\0Mon, 18 Jun 2018 16:58:36 +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" "From: Maxime Ripard <maxime.ripard@bootlin.com>\n" @@ -20,22 +62,22 @@ "@@ -204,6 +204,28 @@\n" " \t};\n" " \n" - " \tsoc at 1c00000 {\n" - "+\t\tsram-controller at 1c00000 {\n" + " \tsoc@1c00000 {\n" + "+\t\tsram-controller@1c00000 {\n" "+\t\t\tcompatible = \"allwinner,sun8i-a33-sram-controller\";\n" "+\t\t\treg = <0x01c00000 0x30>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges;\n" "+\n" - "+\t\t\tsram_c: sram at 1d00000 {\n" + "+\t\t\tsram_c: sram@1d00000 {\n" "+\t\t\t\tcompatible = \"mmio-sram\";\n" "+\t\t\t\treg = <0x01d00000 0xd00000>;\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <1>;\n" "+\t\t\t\tranges = <0 0x01d00000 0xd00000>;\n" "+\n" - "+\t\t\t\tve_sram: sram-section at 0 {\n" + "+\t\t\t\tve_sram: sram-section@0 {\n" "+\t\t\t\t\tcompatible = \"allwinner,sun8i-a33-sram-c1\",\n" "+\t\t\t\t\t\t \"allwinner,sun4i-a10-sram-c1\";\n" "+\t\t\t\t\treg = <0x000000 0x80000>;\n" @@ -43,10 +85,10 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\ttcon0: lcd-controller at 1c0c000 {\n" + " \t\ttcon0: lcd-controller@1c0c000 {\n" " \t\t\tcompatible = \"allwinner,sun8i-a33-tcon\";\n" " \t\t\treg = <0x01c0c000 0x1000>;\n" "-- \n" 2.17.0 -518f36bbbfe4c49072f0630c39eae91065af570a7c44e635077023f4f676cea1 +caac69fc659cd3000f466542432a59822150d7f43aa4776dcb47d7677033543e
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.