diff for duplicates of <53749865.809@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 8abe150..566724a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,13 +34,13 @@ cleanly separate them. For the patch itself, you get a tentative -Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> +Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> to make KM boot again. Sebastian -> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> +> Signed-off-by: Valentin Longchamp <valentin.longchamp-SkAbAL50j+5BDgjK7y7TUQ@public.gmane.org> > --- > > arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 43 ++++++++++++++++++++++++++++++++ @@ -68,7 +68,7 @@ Sebastian > + 0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */ > + 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>; > + -> + pcie0: pcie at 1,0 { +> + pcie0: pcie@1,0 { > + device_type = "pci"; > + assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>; > + reg = <0x0800 0 0 0 0>; @@ -87,8 +87,8 @@ Sebastian > + }; > + }; > + -> ocp at f1000000 { -> pinctrl: pin-controller at 10000 { +> ocp@f1000000 { +> pinctrl: pin-controller@10000 { > compatible = "marvell,98dx4122-pinctrl"; > @@ -6,3 +41,11 @@ > }; @@ -103,3 +103,8 @@ Sebastian > + status = "disabled"; > +}; > + +-- +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/N1/content_digest index 4b9296b..e20d41d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,14 @@ "ref\01400147335-20947-1-git-send-email-valentin.longchamp@keymile.com\0" "ref\01400147335-20947-2-git-send-email-valentin.longchamp@keymile.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 1/3] ARM: dts: kirkwood: resynch 98dx4122 dtsi\0" + "ref\01400147335-20947-2-git-send-email-valentin.longchamp-SkAbAL50j+5BDgjK7y7TUQ@public.gmane.org\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH 1/3] ARM: dts: kirkwood: resynch 98dx4122 dtsi\0" "Date\0Thu, 15 May 2014 12:35:17 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Valentin Longchamp <valentin.longchamp-SkAbAL50j+5BDgjK7y7TUQ@public.gmane.org>" + Linux ARM Kernel <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> + Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> + " Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\0" + "Cc\0Linux device trees <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" "\00:1\0" "b\0" "On 05/15/2014 11:48 AM, Valentin Longchamp wrote:\n" @@ -42,13 +47,13 @@ "\n" "For the patch itself, you get a tentative\n" "\n" - "Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\n" + "Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "\n" "to make KM boot again.\n" "\n" "Sebastian\n" "\n" - "> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>\n" + "> Signed-off-by: Valentin Longchamp <valentin.longchamp-SkAbAL50j+5BDgjK7y7TUQ@public.gmane.org>\n" "> ---\n" ">\n" "> arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 43 ++++++++++++++++++++++++++++++++\n" @@ -76,7 +81,7 @@ "> +\t\t\t\t0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */\n" "> +\t\t\t\t0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>;\n" "> +\n" - "> +\t\t\tpcie0: pcie at 1,0 {\n" + "> +\t\t\tpcie0: pcie@1,0 {\n" "> +\t\t\t\tdevice_type = \"pci\";\n" "> +\t\t\t\tassigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;\n" "> +\t\t\t\treg = <0x0800 0 0 0 0>;\n" @@ -95,8 +100,8 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> \tocp at f1000000 {\n" - "> \t\tpinctrl: pin-controller at 10000 {\n" + "> \tocp@f1000000 {\n" + "> \t\tpinctrl: pin-controller@10000 {\n" "> \t\t\tcompatible = \"marvell,98dx4122-pinctrl\";\n" "> @@ -6,3 +41,11 @@\n" "> \t\t};\n" @@ -110,6 +115,11 @@ "> +&sata_phy1 {\n" "> +\tstatus = \"disabled\";\n" "> +};\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 -78b8f244d4a6b6c2dc1985da7626a3176450fad7604bfa9e27b25528256ac69e +9af324c9460e7b694a5feef19cd00ade8f48f2e12d4e4c3a94cceece6cbd70dd
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.