diff for duplicates of <55FF0B18.5060505@gmail.com> diff --git a/a/1.txt b/N1/1.txt index adf52fd..cc858e2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,12 +20,12 @@ one adding the default pinmux to uart0 node. > }; > }; > -> + soc_pinctrl: pinctrl@ea8000 { +> + soc_pinctrl: pinctrl at ea8000 { > + compatible = "marvell,berlin4ct-soc-pinctrl"; > + reg = <0xea8000 0x14>; > + }; > + -> + avio_pinctrl: pinctrl@ea8400 { +> + avio_pinctrl: pinctrl at ea8400 { > + compatible = "marvell,berlin4ct-avio-pinctrl"; > + reg = <0xea8400 8>; @@ -33,7 +33,7 @@ s/8/0x8/ > + }; > + -> apb@fc0000 { +> apb at fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -278,6 +288,23 @@ @@ -50,7 +50,7 @@ pinctrl-names element. > + }; > + }; > + -> + sm_pinctrl: pinctrl@fe2200 { +> + sm_pinctrl: pinctrl at fe2200 { > + compatible = "marvell,berlin4ct-sm-pinctrl"; > + reg = <0xfe2200 0xc>; > + diff --git a/a/content_digest b/N1/content_digest index d062c86..adc2290 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,9 @@ "ref\01442656956-5740-1-git-send-email-jszhang@marvell.com\0" "ref\01442656956-5740-6-git-send-email-jszhang@marvell.com\0" - "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" - "Subject\0Re: [PATCH 5/5] arm64: dts: berlin4ct: add the pinctrl node and muxing setup for uart0\0" + "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" + "Subject\0[PATCH 5/5] arm64: dts: berlin4ct: add the pinctrl node and muxing setup for uart0\0" "Date\0Sun, 20 Sep 2015 21:38:00 +0200\0" - "To\0Jisheng Zhang <jszhang@marvell.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\0" - "Cc\0devicetree@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 19.09.2015 12:02, Jisheng Zhang wrote:\n" @@ -41,12 +28,12 @@ "> \t\t\t};\n" "> \t\t};\n" ">\n" - "> +\t\tsoc_pinctrl: pinctrl@ea8000 {\n" + "> +\t\tsoc_pinctrl: pinctrl at ea8000 {\n" "> +\t\t\tcompatible = \"marvell,berlin4ct-soc-pinctrl\";\n" "> +\t\t\treg = <0xea8000 0x14>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tavio_pinctrl: pinctrl@ea8400 {\n" + "> +\t\tavio_pinctrl: pinctrl at ea8400 {\n" "> +\t\t\tcompatible = \"marvell,berlin4ct-avio-pinctrl\";\n" "> +\t\t\treg = <0xea8400 8>;\n" "\n" @@ -54,7 +41,7 @@ "\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" "> @@ -278,6 +288,23 @@\n" @@ -71,7 +58,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tsm_pinctrl: pinctrl@fe2200 {\n" + "> +\t\tsm_pinctrl: pinctrl at fe2200 {\n" "> +\t\t\tcompatible = \"marvell,berlin4ct-sm-pinctrl\";\n" "> +\t\t\treg = <0xfe2200 0xc>;\n" "> +\n" @@ -104,4 +91,4 @@ "> \t};\n" > -2c50db64a7721c6cb83278a1420a419b4fad5c31f804e0ed5d6ae17e66a50e32 +2ea2c86df28fd78fd0905bdd64bba1453f4d3150cc6b762dd271358218ff7472
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.