diff for duplicates of <201203141749.05899.sr@denx.de> diff --git a/a/1.txt b/N1/1.txt index 7988ce9..ceb41ff 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,9 +19,9 @@ On Wednesday 14 March 2012 17:21:52 Jean-Christophe PLAGNIOL-VILLARD wrote: > > Additionally the file spear600.c is deleted. It contained only > > one empty function and is not needed. So lets just remove it. > > -> > Signed-off-by: Stefan Roese <sr@denx.de> -> > Cc: Viresh Kumar <viresh.kumar@st.com> -> > Cc: Arnd Bergmann <arnd@arndb.de> +> > Signed-off-by: Stefan Roese <sr-ynQEQJNshbs@public.gmane.org> +> > Cc: Viresh Kumar <viresh.kumar-qxv4g6HH51o@public.gmane.org> +> > Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> > > --- > > v2: > > - Added DT support to spear6xx.c instead of creating board-dt.c @@ -81,7 +81,7 @@ On Wednesday 14 March 2012 17:21:52 Jean-Christophe PLAGNIOL-VILLARD wrote: > > +++ b/arch/arm/boot/dts/spear600-evb.dts > > @@ -0,0 +1,30 @@ > > +/* -> > + * Copyright 2012 Stefan Roese <sr@denx.de> +> > + * Copyright 2012 Stefan Roese <sr-ynQEQJNshbs@public.gmane.org> > > + * > > + * The code contained herein is licensed under the GNU General Public > > + * License. You may obtain a copy of the GNU General Public License @@ -106,11 +106,11 @@ Might I ask why? Other *.dtsi files don't have it either. > > + > > + soc { -> > + gmac0: ethernet at e0800000 { +> > + gmac0: ethernet@e0800000 { > > + phy-mode = "gmii"; > > + }; > > + -> > + i2c at d0200000 { +> > + i2c@d0200000 { > > + clock-frequency = <400000>; > > + }; > > + }; @@ -122,7 +122,7 @@ Might I ask why? Other *.dtsi files don't have it either. > > +++ b/arch/arm/boot/dts/spear600.dtsi > > @@ -0,0 +1,162 @@ > > +/* -> > + * Copyright 2012 Stefan Roese <sr@denx.de> +> > + * Copyright 2012 Stefan Roese <sr-ynQEQJNshbs@public.gmane.org> > > + * > > + * The code contained herein is licensed under the GNU General Public > > + * License. You may obtain a copy of the GNU General Public License @@ -138,7 +138,7 @@ Might I ask why? Other *.dtsi files don't have it either. > > + compatible = "st,spear600"; > > + > > + cpus { -> > + cpu at 0 { +> > + cpu@0 { > > + compatible = "arm,arm926ejs"; > > + }; > > + }; @@ -166,28 +166,28 @@ Okay. > > + compatible = "simple-bus"; > > + ranges; > > + -> > + vic0: interrupt-controller at f1100000 { +> > + vic0: interrupt-controller@f1100000 { > > + compatible = "arm,pl190-vic"; > > + interrupt-controller; > > + reg = <0xf1100000 0x1000>; > > + #interrupt-cells = <1>; > > + }; > > + -> > + vic1: interrupt-controller at f1000000 { +> > + vic1: interrupt-controller@f1000000 { > > + compatible = "arm,pl190-vic"; > > + interrupt-controller; > > + reg = <0xf1000000 0x1000>; > > + #interrupt-cells = <1>; > > + }; > > + -> > + serial at d0000000 { +> > + serial@d0000000 { > > + compatible = "arm,pl011", "arm,primecell"; > > + reg = <0xd0000000 0x1000>; > > + interrupt-parent = <&vic0>; > > + interrupts = <24>; > > + }; > > + -> > + serial at d0080000 { +> > + serial@d0080000 { > > + compatible = "arm,pl011", "arm,primecell"; > > + reg = <0xd0080000 0x1000>; > > + interrupt-parent = <&vic0>; @@ -195,7 +195,7 @@ Okay. > > + }; > > + > > + /* local/cpu GPIO */ -> > + gpio0: gpio at f0100000 { +> > + gpio0: gpio@f0100000 { > > + #gpio-cells = <2>; > > + compatible = "arm,pl061", "arm,primecell"; > > + gpio-controller; @@ -205,7 +205,7 @@ Okay. > > + }; > > + > > + /* basic GPIO */ -> > + gpio1: gpio at fc980000 { +> > + gpio1: gpio@fc980000 { > > + #gpio-cells = <2>; > > + compatible = "arm,pl061", "arm,primecell"; > > + gpio-controller; @@ -215,7 +215,7 @@ Okay. > > + }; > > + > > + /* appl GPIO */ -> > + gpio2: gpio at d8100000 { +> > + gpio2: gpio@d8100000 { > > + #gpio-cells = <2>; > > + compatible = "arm,pl061", "arm,primecell"; > > + gpio-controller; @@ -224,7 +224,7 @@ Okay. > > + interrupts = <4>; > > + }; > > + -> > + gmac0: ethernet at e0800000 { +> > + gmac0: ethernet@e0800000 { > > + compatible = "st,spear600-gmac"; > > + reg = <0xe0800000 0x8000>; > > + interrupt-parent = <&vic1>; @@ -234,7 +234,7 @@ Okay. */ > > + }; > > + -> > + i2c at d0200000 { +> > + i2c@d0200000 { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + compatible = "snps,designware-i2c"; @@ -243,7 +243,7 @@ Okay. > > + interrupts = <28>; > > + }; > > + -> > + fsmc0: flash at d1800000 { +> > + fsmc0: flash@d1800000 { > > + status = "disabled"; > > + compatible = "st,spear600-fsmc-nand"; > > + #address-cells = <1>; @@ -253,7 +253,7 @@ Okay. > > + reg-names = "fsmc_regs", "nand_data"; > > + }; > > + -> > + smi0: flash at fc000000 { +> > + smi0: flash@fc000000 { > > + status = "disabled"; > > + compatible = "st,spear600-smi"; > > + #address-cells = <1>; @@ -263,7 +263,7 @@ Okay. > > + interrupts = <12>; > > + }; > > + -> > + ehci at e1800000 { +> > + ehci@e1800000 { > > + status = "disabled"; > > + compatible = "st,spear600-ehci", "usb-ehci"; > > + reg = <0xe1800000 0x1000>; @@ -271,7 +271,7 @@ Okay. > > + interrupts = <27>; > > + }; > > + -> > + ehci at e2000000 { +> > + ehci@e2000000 { > > + status = "disabled"; > > + compatible = "st,spear600-ehci", "usb-ehci"; > > + reg = <0xe2000000 0x1000>; @@ -279,7 +279,7 @@ Okay. > > + interrupts = <29>; > > + }; > > + -> > + ohci at e1900000 { +> > + ohci@e1900000 { > > + status = "disabled"; > > + compatible = "st,spear600-ohci", "usb-ohci"; > > + reg = <0xe1900000 0x1000>; @@ -287,7 +287,7 @@ Okay. > > + interrupts = <26>; > > + }; > > + -> > + ohci at e2100000 { +> > + ohci@e2100000 { > > + status = "disabled"; > > + compatible = "st,spear600-ohci", "usb-ohci"; > > + reg = <0xe2100000 0x1000>; @@ -353,7 +353,7 @@ patches. > > - * SPEAr600 machine source file > > - * > > - * Copyright (C) 2009 ST Microelectronics -> > - * Rajeev Kumar<rajeev-dlh.kumar@st.com> +> > - * Rajeev Kumar<rajeev-dlh.kumar-qxv4g6HH51o@public.gmane.org> > > - * > > - * This file is licensed under the terms of the GNU General Public > > - * License version 2. This program is licensed "as is" without any @@ -396,10 +396,10 @@ patches. > > @@ -6,6 +6,8 @@ > > > > * Copyright (C) 2009 ST Microelectronics -> > * Rajeev Kumar<rajeev-dlh.kumar@st.com> +> > * Rajeev Kumar<rajeev-dlh.kumar-qxv4g6HH51o@public.gmane.org> > > * > > -> > + * Copyright 2012 Stefan Roese <sr@denx.de> +> > + * Copyright 2012 Stefan Roese <sr-ynQEQJNshbs@public.gmane.org> > > + * > > > > * This file is licensed under the terms of the GNU General Public diff --git a/a/content_digest b/N1/content_digest index 8c7c814..a81828d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,14 @@ "ref\01331737232-25477-1-git-send-email-sr@denx.de\0" "ref\020120314162152.GN18320@game.jcrosoft.org\0" - "From\0sr@denx.de (Stefan Roese)\0" - "Subject\0[PATCH v2] ARM: SPEAr600: Add device-tree support to SPEAr600 boards\0" + "ref\020120314162152.GN18320-RQcB7r2h9QmfDR2tN2SG5Ni2O/JbrIOy@public.gmane.org\0" + "From\0Stefan Roese <sr-ynQEQJNshbs@public.gmane.org>\0" + "Subject\0Re: [PATCH v2] ARM: SPEAr600: Add device-tree support to SPEAr600 boards\0" "Date\0Wed, 14 Mar 2012 17:49:05 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>\0" + "Cc\0Viresh Kumar <viresh.kumar-qxv4g6HH51o@public.gmane.org>" + devicetree-discuss-mnsaURCQ41sdnm+yROfE0A@public.gmane.org + spear-devel-nkJGhpqTU55BDgjK7y7TUQ@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On Wednesday 14 March 2012 17:21:52 Jean-Christophe PLAGNIOL-VILLARD wrote:\n" @@ -27,9 +32,9 @@ "> > Additionally the file spear600.c is deleted. It contained only\n" "> > one empty function and is not needed. So lets just remove it.\n" "> > \n" - "> > Signed-off-by: Stefan Roese <sr@denx.de>\n" - "> > Cc: Viresh Kumar <viresh.kumar@st.com>\n" - "> > Cc: Arnd Bergmann <arnd@arndb.de>\n" + "> > Signed-off-by: Stefan Roese <sr-ynQEQJNshbs@public.gmane.org>\n" + "> > Cc: Viresh Kumar <viresh.kumar-qxv4g6HH51o@public.gmane.org>\n" + "> > Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\n" "> > ---\n" "> > v2:\n" "> > - Added DT support to spear6xx.c instead of creating board-dt.c\n" @@ -89,7 +94,7 @@ "> > +++ b/arch/arm/boot/dts/spear600-evb.dts\n" "> > @@ -0,0 +1,30 @@\n" "> > +/*\n" - "> > + * Copyright 2012 Stefan Roese <sr@denx.de>\n" + "> > + * Copyright 2012 Stefan Roese <sr-ynQEQJNshbs@public.gmane.org>\n" "> > + *\n" "> > + * The code contained herein is licensed under the GNU General Public\n" "> > + * License. You may obtain a copy of the GNU General Public License\n" @@ -114,11 +119,11 @@ "\n" "> > +\n" "> > +\tsoc {\n" - "> > +\t\tgmac0: ethernet at e0800000 {\n" + "> > +\t\tgmac0: ethernet@e0800000 {\n" "> > +\t\t\tphy-mode = \"gmii\";\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\ti2c at d0200000 {\n" + "> > +\t\ti2c@d0200000 {\n" "> > +\t\t\tclock-frequency = <400000>;\n" "> > +\t\t};\n" "> > +\t};\n" @@ -130,7 +135,7 @@ "> > +++ b/arch/arm/boot/dts/spear600.dtsi\n" "> > @@ -0,0 +1,162 @@\n" "> > +/*\n" - "> > + * Copyright 2012 Stefan Roese <sr@denx.de>\n" + "> > + * Copyright 2012 Stefan Roese <sr-ynQEQJNshbs@public.gmane.org>\n" "> > + *\n" "> > + * The code contained herein is licensed under the GNU General Public\n" "> > + * License. You may obtain a copy of the GNU General Public License\n" @@ -146,7 +151,7 @@ "> > +\tcompatible = \"st,spear600\";\n" "> > +\n" "> > +\tcpus {\n" - "> > +\t\tcpu at 0 {\n" + "> > +\t\tcpu@0 {\n" "> > +\t\t\tcompatible = \"arm,arm926ejs\";\n" "> > +\t\t};\n" "> > +\t};\n" @@ -174,28 +179,28 @@ "> > +\t\tcompatible = \"simple-bus\";\n" "> > +\t\tranges;\n" "> > +\n" - "> > +\t\tvic0: interrupt-controller at f1100000 {\n" + "> > +\t\tvic0: interrupt-controller@f1100000 {\n" "> > +\t\t\tcompatible = \"arm,pl190-vic\";\n" "> > +\t\t\tinterrupt-controller;\n" "> > +\t\t\treg = <0xf1100000 0x1000>;\n" "> > +\t\t\t#interrupt-cells = <1>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tvic1: interrupt-controller at f1000000 {\n" + "> > +\t\tvic1: interrupt-controller@f1000000 {\n" "> > +\t\t\tcompatible = \"arm,pl190-vic\";\n" "> > +\t\t\tinterrupt-controller;\n" "> > +\t\t\treg = <0xf1000000 0x1000>;\n" "> > +\t\t\t#interrupt-cells = <1>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tserial at d0000000 {\n" + "> > +\t\tserial@d0000000 {\n" "> > +\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> > +\t\t\treg = <0xd0000000 0x1000>;\n" "> > +\t\t\tinterrupt-parent = <&vic0>;\n" "> > +\t\t\tinterrupts = <24>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tserial at d0080000 {\n" + "> > +\t\tserial@d0080000 {\n" "> > +\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> > +\t\t\treg = <0xd0080000 0x1000>;\n" "> > +\t\t\tinterrupt-parent = <&vic0>;\n" @@ -203,7 +208,7 @@ "> > +\t\t};\n" "> > +\n" "> > +\t\t/* local/cpu GPIO */\n" - "> > +\t\tgpio0: gpio at f0100000 {\n" + "> > +\t\tgpio0: gpio@f0100000 {\n" "> > +\t\t\t#gpio-cells = <2>;\n" "> > +\t\t\tcompatible = \"arm,pl061\", \"arm,primecell\";\n" "> > +\t\t\tgpio-controller;\n" @@ -213,7 +218,7 @@ "> > +\t\t};\n" "> > +\n" "> > +\t\t/* basic GPIO */\n" - "> > +\t\tgpio1: gpio at fc980000 {\n" + "> > +\t\tgpio1: gpio@fc980000 {\n" "> > +\t\t\t#gpio-cells = <2>;\n" "> > +\t\t\tcompatible = \"arm,pl061\", \"arm,primecell\";\n" "> > +\t\t\tgpio-controller;\n" @@ -223,7 +228,7 @@ "> > +\t\t};\n" "> > +\n" "> > +\t\t/* appl GPIO */\n" - "> > +\t\tgpio2: gpio at d8100000 {\n" + "> > +\t\tgpio2: gpio@d8100000 {\n" "> > +\t\t\t#gpio-cells = <2>;\n" "> > +\t\t\tcompatible = \"arm,pl061\", \"arm,primecell\";\n" "> > +\t\t\tgpio-controller;\n" @@ -232,7 +237,7 @@ "> > +\t\t\tinterrupts = <4>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tgmac0: ethernet at e0800000 {\n" + "> > +\t\tgmac0: ethernet@e0800000 {\n" "> > +\t\t\tcompatible = \"st,spear600-gmac\";\n" "> > +\t\t\treg = <0xe0800000 0x8000>;\n" "> > +\t\t\tinterrupt-parent = <&vic1>;\n" @@ -242,7 +247,7 @@ "*/\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\ti2c at d0200000 {\n" + "> > +\t\ti2c@d0200000 {\n" "> > +\t\t\t#address-cells = <1>;\n" "> > +\t\t\t#size-cells = <0>;\n" "> > +\t\t\tcompatible = \"snps,designware-i2c\";\n" @@ -251,7 +256,7 @@ "> > +\t\t\tinterrupts = <28>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tfsmc0: flash at d1800000 {\n" + "> > +\t\tfsmc0: flash@d1800000 {\n" "> > +\t\t\tstatus = \"disabled\";\n" "> > +\t\t\tcompatible = \"st,spear600-fsmc-nand\";\n" "> > +\t\t\t#address-cells = <1>;\n" @@ -261,7 +266,7 @@ "> > +\t\t\treg-names = \"fsmc_regs\", \"nand_data\";\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tsmi0: flash at fc000000 {\n" + "> > +\t\tsmi0: flash@fc000000 {\n" "> > +\t\t\tstatus = \"disabled\";\n" "> > +\t\t\tcompatible = \"st,spear600-smi\";\n" "> > +\t\t\t#address-cells = <1>;\n" @@ -271,7 +276,7 @@ "> > +\t\t\tinterrupts = <12>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tehci at e1800000 {\n" + "> > +\t\tehci@e1800000 {\n" "> > +\t\t\tstatus = \"disabled\";\n" "> > +\t\t\tcompatible = \"st,spear600-ehci\", \"usb-ehci\";\n" "> > +\t\t\treg = <0xe1800000 0x1000>;\n" @@ -279,7 +284,7 @@ "> > +\t\t\tinterrupts = <27>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tehci at e2000000 {\n" + "> > +\t\tehci@e2000000 {\n" "> > +\t\t\tstatus = \"disabled\";\n" "> > +\t\t\tcompatible = \"st,spear600-ehci\", \"usb-ehci\";\n" "> > +\t\t\treg = <0xe2000000 0x1000>;\n" @@ -287,7 +292,7 @@ "> > +\t\t\tinterrupts = <29>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tohci at e1900000 {\n" + "> > +\t\tohci@e1900000 {\n" "> > +\t\t\tstatus = \"disabled\";\n" "> > +\t\t\tcompatible = \"st,spear600-ohci\", \"usb-ohci\";\n" "> > +\t\t\treg = <0xe1900000 0x1000>;\n" @@ -295,7 +300,7 @@ "> > +\t\t\tinterrupts = <26>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tohci at e2100000 {\n" + "> > +\t\tohci@e2100000 {\n" "> > +\t\t\tstatus = \"disabled\";\n" "> > +\t\t\tcompatible = \"st,spear600-ohci\", \"usb-ohci\";\n" "> > +\t\t\treg = <0xe2100000 0x1000>;\n" @@ -361,7 +366,7 @@ "> > - * SPEAr600 machine source file\n" "> > - *\n" "> > - * Copyright (C) 2009 ST Microelectronics\n" - "> > - * Rajeev Kumar<rajeev-dlh.kumar@st.com>\n" + "> > - * Rajeev Kumar<rajeev-dlh.kumar-qxv4g6HH51o@public.gmane.org>\n" "> > - *\n" "> > - * This file is licensed under the terms of the GNU General Public\n" "> > - * License version 2. This program is licensed \"as is\" without any\n" @@ -404,10 +409,10 @@ "> > @@ -6,6 +6,8 @@\n" "> > \n" "> > * Copyright (C) 2009 ST Microelectronics\n" - "> > * Rajeev Kumar<rajeev-dlh.kumar@st.com>\n" + "> > * Rajeev Kumar<rajeev-dlh.kumar-qxv4g6HH51o@public.gmane.org>\n" "> > *\n" "> > \n" - "> > + * Copyright 2012 Stefan Roese <sr@denx.de>\n" + "> > + * Copyright 2012 Stefan Roese <sr-ynQEQJNshbs@public.gmane.org>\n" "> > + *\n" "> > \n" "> > * This file is licensed under the terms of the GNU General Public\n" @@ -492,4 +497,4 @@ "Cheers,\n" Stefan -53b8a64fed3dc087047f65f56d31f7304b08996277ee15c59fb55bde1ec3cb63 +c869f3a09b58d86f1c445ce001b4eb707b0921b4bb44137aa7936c240a97ff21
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.