diff for duplicates of <564F8B73.7070403@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 81b04f9..e5e1694 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,7 @@ and deal with the internals by using "simple-mfd" and "syscon" regmaps. > + bypass-shift = /bits/ 8 <1>; > + }; > + -> apb@e80000 { +> apb at e80000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -225,6 +242,27 @@ @@ -87,7 +87,7 @@ Sebastian > + clocks = <&syspll>; > + }; > + -> soc_pinctrl: pin-controller@ea8000 { +> soc_pinctrl: pin-controller at ea8000 { > compatible = "marvell,berlin4ct-soc-pinctrl"; > reg = <0xea8000 0x14>; > diff --git a/a/content_digest b/N1/content_digest index bbb0667..70b67b0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,9 @@ "ref\01448008952-1787-1-git-send-email-jszhang@marvell.com\0" "ref\01448008952-1787-7-git-send-email-jszhang@marvell.com\0" - "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" - "Subject\0Re: [PATCH v2 6/6] arm64: dts: berlin4ct: add pll and clock nodes\0" + "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" + "Subject\0[PATCH v2 6/6] arm64: dts: berlin4ct: add pll and clock nodes\0" "Date\0Fri, 20 Nov 2015 22:06:59 +0100\0" - "To\0Jisheng Zhang <jszhang@marvell.com>" - robh+dt@kernel.org - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - catalin.marinas@arm.com - will.deacon@arm.com - mturquette@baylibre.com - sboyd@codeaurora.org - " antoine.tenart@free-electrons.com\0" - "Cc\0devicetree@vger.kernel.org" - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-clk@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 20.11.2015 09:42, Jisheng Zhang wrote:\n" @@ -68,7 +54,7 @@ "> +\t\t\tbypass-shift = /bits/ 8 <1>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb@e80000 {\n" + "> \t\tapb at e80000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -225,6 +242,27 @@\n" @@ -109,9 +95,9 @@ "> +\t\t\tclocks = <&syspll>;\n" "> +\t\t};\n" "> +\n" - "> \t\tsoc_pinctrl: pin-controller@ea8000 {\n" + "> \t\tsoc_pinctrl: pin-controller at ea8000 {\n" "> \t\t\tcompatible = \"marvell,berlin4ct-soc-pinctrl\";\n" "> \t\t\treg = <0xea8000 0x14>;\n" > -2647abc3fb851a1ee82f2a51ea1df0bce06965ac668176c03d752762e9d82bd9 +61e71b9805c46dfadc94b432116f51553f066db12255cb8444e2c010c2a65c29
diff --git a/a/1.txt b/N2/1.txt index 81b04f9..da5e2fb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,7 +1,7 @@ On 20.11.2015 09:42, Jisheng Zhang wrote: > Add syspll, mempll, cpupll, gateclk and berlin-clk nodes. > -> Signed-off-by: Jisheng Zhang <jszhang@marvell.com> +> Signed-off-by: Jisheng Zhang <jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> > --- > arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 38 ++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) @@ -90,4 +90,9 @@ Sebastian > soc_pinctrl: pin-controller@ea8000 { > compatible = "marvell,berlin4ct-soc-pinctrl"; > reg = <0xea8000 0x14>; -> +> + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index bbb0667..d1f38bb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,30 @@ "ref\01448008952-1787-1-git-send-email-jszhang@marvell.com\0" "ref\01448008952-1787-7-git-send-email-jszhang@marvell.com\0" - "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "ref\01448008952-1787-7-git-send-email-jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Subject\0Re: [PATCH v2 6/6] arm64: dts: berlin4ct: add pll and clock nodes\0" "Date\0Fri, 20 Nov 2015 22:06:59 +0100\0" - "To\0Jisheng Zhang <jszhang@marvell.com>" - robh+dt@kernel.org - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - catalin.marinas@arm.com - will.deacon@arm.com - mturquette@baylibre.com - sboyd@codeaurora.org - " antoine.tenart@free-electrons.com\0" - "Cc\0devicetree@vger.kernel.org" - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-clk@vger.kernel.org\0" + "To\0Jisheng Zhang <jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>" + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + pawel.moll-5wv7dgnIgG8@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + catalin.marinas-5wv7dgnIgG8@public.gmane.org + will.deacon-5wv7dgnIgG8@public.gmane.org + mturquette-rdvid1DuHRBWk0Htik3J/w@public.gmane.org + sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + " antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 20.11.2015 09:42, Jisheng Zhang wrote:\n" "> Add syspll, mempll, cpupll, gateclk and berlin-clk nodes.\n" "> \n" - "> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>\n" + "> Signed-off-by: Jisheng Zhang <jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>\n" "> ---\n" "> arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 38 ++++++++++++++++++++++++++++++\n" "> 1 file changed, 38 insertions(+)\n" @@ -112,6 +113,11 @@ "> \t\tsoc_pinctrl: pin-controller@ea8000 {\n" "> \t\t\tcompatible = \"marvell,berlin4ct-soc-pinctrl\";\n" "> \t\t\treg = <0xea8000 0x14>;\n" - > + "> \n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -2647abc3fb851a1ee82f2a51ea1df0bce06965ac668176c03d752762e9d82bd9 +9c63e4146abc4cedd47351d00acb22f58ef49c3d5f6ca31bd23bf75d562c8b10
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.