diff for duplicates of <20151009090640.GE2842@kwain> diff --git a/a/1.txt b/N1/1.txt index adee028..3631e6f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,17 +17,17 @@ Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com> > }; > }; > -> + soc_pinctrl: pin-controller@ea8000 { +> + soc_pinctrl: pin-controller at ea8000 { > + compatible = "marvell,berlin4ct-soc-pinctrl"; > + reg = <0xea8000 0x14>; > + }; > + -> + avio_pinctrl: pin-controller@ea8400 { +> + avio_pinctrl: pin-controller at ea8400 { > + compatible = "marvell,berlin4ct-avio-pinctrl"; > + reg = <0xea8400 0x8>; > + }; > + -> apb@fc0000 { +> apb at fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -280,5 +290,10 @@ @@ -35,7 +35,7 @@ Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com> > }; > }; > + -> + system_pinctrl: pin-controller@fe2200 { +> + system_pinctrl: pin-controller at fe2200 { > + compatible = "marvell,berlin4ct-system-pinctrl"; > + reg = <0xfe2200 0xc>; > + }; @@ -46,6 +46,6 @@ Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com> > -- -Antoine Ténart, Free Electrons +Antoine T?nart, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com diff --git a/a/content_digest b/N1/content_digest index a70e70a..3fe09e5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,9 @@ "ref\01444378629-3057-1-git-send-email-jszhang@marvell.com\0" "ref\01444378629-3057-6-git-send-email-jszhang@marvell.com\0" - "From\0Antoine Tenart <antoine.tenart@free-electrons.com>\0" - "Subject\0Re: [PATCH v4 5/6] arm64: dts: berlin4ct: add the pinctrl node\0" + "From\0antoine.tenart@free-electrons.com (Antoine Tenart)\0" + "Subject\0[PATCH v4 5/6] arm64: dts: berlin4ct: add the pinctrl node\0" "Date\0Fri, 9 Oct 2015 11:06:40 +0200\0" - "To\0Jisheng Zhang <jszhang@marvell.com>\0" - "Cc\0sebastian.hesselbarth@gmail.com" - linus.walleij@linaro.org - antoine.tenart@free-electrons.com - catalin.marinas@arm.com - will.deacon@arm.com - mark.rutland@arm.com - robh+dt@kernel.org - pawel.moll@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-gpio@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, Oct 09, 2015 at 04:17:08PM +0800, Jisheng Zhang wrote:\n" @@ -39,17 +25,17 @@ "> \t\t\t};\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" "> +\t\t};\n" "> +\n" - "> +\t\tavio_pinctrl: pin-controller@ea8400 {\n" + "> +\t\tavio_pinctrl: pin-controller at ea8400 {\n" "> +\t\t\tcompatible = \"marvell,berlin4ct-avio-pinctrl\";\n" "> +\t\t\treg = <0xea8400 0x8>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb@fc0000 {\n" + "> \t\tapb at fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -280,5 +290,10 @@\n" @@ -57,7 +43,7 @@ "> \t\t\t};\n" "> \t\t};\n" "> +\n" - "> +\t\tsystem_pinctrl: pin-controller@fe2200 {\n" + "> +\t\tsystem_pinctrl: pin-controller at fe2200 {\n" "> +\t\t\tcompatible = \"marvell,berlin4ct-system-pinctrl\";\n" "> +\t\t\treg = <0xfe2200 0xc>;\n" "> +\t\t};\n" @@ -68,8 +54,8 @@ "> \n" "\n" "-- \n" - "Antoine T\303\251nart, Free Electrons\n" + "Antoine T?nart, Free Electrons\n" "Embedded Linux, Kernel and Android engineering\n" http://free-electrons.com -57dde7b23054e53386c90ddfc9b64345c1d0e84eb001ccf52f266786b828d7d7 +49c8809164dd6661ad89f54c8bec23162f64daeb9cb75d96b29e7297043f7236
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.