diff for duplicates of <53680EAC.3090401@baker-net.org.uk> diff --git a/a/1.txt b/N1/1.txt index 3d27803..74ec1b3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,9 +33,9 @@ Adam Baker > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Gregory Clement <gregory.clement@free-electrons.com> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -> Cc: devicetree at vger.kernel.org -> Cc: linux-arm-kernel at lists.infradead.org -> Cc: linux-kernel at vger.kernel.org +> Cc: devicetree@vger.kernel.org +> Cc: linux-arm-kernel@lists.infradead.org +> Cc: linux-kernel@vger.kernel.org > --- > arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 18 ++++++++++-------- > arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 18 ++++++++++-------- @@ -53,24 +53,24 @@ Adam Baker > + pcie-controller { > + status = "okay"; > + -> + pcie at 1,0 { +> + pcie@1,0 { > + status = "okay"; > + }; > + }; > + }; > + -> ocp at f1000000 { -> pinctrl at 10000 { +> ocp@f1000000 { +> pinctrl@10000 { > pmx_usb_led: pmx-usb-led { > @@ -73,14 +83,6 @@ -> ehci at 50000 { +> ehci@50000 { > status = "okay"; > }; > - > - pcie-controller { > - status = "okay"; > - -> - pcie at 1,0 { +> - pcie@1,0 { > - status = "okay"; > - }; > - }; @@ -89,14 +89,14 @@ Adam Baker > + pcie-controller { > + status = "okay"; > + -> + pcie at 1,0 { +> + pcie@1,0 { > + status = "okay"; > + }; > + }; > + }; > + -> ocp at f1000000 { -> pinctrl: pinctrl at 10000 { +> ocp@f1000000 { +> pinctrl: pinctrl@10000 { > > @@ -51,14 +61,6 @@ > status = "okay"; @@ -106,7 +106,7 @@ Adam Baker > - pcie-controller { > - status = "okay"; > - -> - pcie at 1,0 { +> - pcie@1,0 { > - status = "okay"; > - }; > - }; diff --git a/a/content_digest b/N1/content_digest index 02a7daf..4375f49 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,22 @@ "ref\01398862602-29595-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01398862602-29595-2-git-send-email-sebastian.hesselbarth@gmail.com\0" - "From\0linux@baker-net.org.uk (Adam Baker)\0" - "Subject\0[PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes\0" + "From\0Adam Baker <linux@baker-net.org.uk>\0" + "Subject\0Re: [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes\0" "Date\0Mon, 05 May 2014 23:20:28 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + Andrew Lunn <andrew@lunn.ch> + Russell King <linux@arm.linux.org.uk> + Jason Cooper <jason@lakedaemon.net> + Pawel Moll <pawel.moll@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + linux-kernel@vger.kernel.org + devicetree@vger.kernel.org + Rob Herring <robh+dt@kernel.org> + Kumar Gala <galak@codeaurora.org> + Gregory Clement <gregory.clement@free-electrons.com> + Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 30/04/14 13:56, Sebastian Hesselbarth wrote:\n" @@ -41,9 +54,9 @@ "> Cc: Andrew Lunn <andrew@lunn.ch>\n" "> Cc: Gregory Clement <gregory.clement@free-electrons.com>\n" "> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>\n" - "> Cc: devicetree at vger.kernel.org\n" - "> Cc: linux-arm-kernel at lists.infradead.org\n" - "> Cc: linux-kernel at vger.kernel.org\n" + "> Cc: devicetree@vger.kernel.org\n" + "> Cc: linux-arm-kernel@lists.infradead.org\n" + "> Cc: linux-kernel@vger.kernel.org\n" "> ---\n" "> arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 18 ++++++++++--------\n" "> arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 18 ++++++++++--------\n" @@ -61,24 +74,24 @@ "> +\t\tpcie-controller {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\tpcie at 1,0 {\n" + "> +\t\t\tpcie@1,0 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\t\t};\n" "> + };\n" "> +\n" - "> \tocp at f1000000 {\n" - "> \t\tpinctrl at 10000 {\n" + "> \tocp@f1000000 {\n" + "> \t\tpinctrl@10000 {\n" "> \t\t\tpmx_usb_led: pmx-usb-led {\n" "> @@ -73,14 +83,6 @@\n" - "> \t\tehci at 50000 {\n" + "> \t\tehci@50000 {\n" "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" "> -\n" "> -\t\tpcie-controller {\n" "> -\t\t\tstatus = \"okay\";\n" "> -\n" - "> -\t\t\tpcie at 1,0 {\n" + "> -\t\t\tpcie@1,0 {\n" "> -\t\t\t\tstatus = \"okay\";\n" "> -\t\t\t};\n" "> -\t\t};\n" @@ -97,14 +110,14 @@ "> +\t\tpcie-controller {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\tpcie at 1,0 {\n" + "> +\t\t\tpcie@1,0 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\t};\n" "> +\n" - "> \tocp at f1000000 {\n" - "> \t\tpinctrl: pinctrl at 10000 {\n" + "> \tocp@f1000000 {\n" + "> \t\tpinctrl: pinctrl@10000 {\n" ">\n" "> @@ -51,14 +61,6 @@\n" "> \t\t\tstatus = \"okay\";\n" @@ -114,7 +127,7 @@ "> -\t\tpcie-controller {\n" "> -\t\t\tstatus = \"okay\";\n" "> -\n" - "> -\t\t\tpcie at 1,0 {\n" + "> -\t\t\tpcie@1,0 {\n" "> -\t\t\t\tstatus = \"okay\";\n" "> -\t\t\t};\n" "> -\t\t};\n" @@ -123,4 +136,4 @@ "> \tgpio_poweroff {\n" > -60e57e0541054077f1aae242c63fc1e88d555ba2012db9f5f870479d4694a3e3 +047520e9169332378312a8659beb4c8b182ca26d262a4c8ea4bfe4928eec15ae
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.