diff for duplicates of <20140707145721.GC3113@piout.net> diff --git a/a/1.txt b/N1/1.txt index 59149bd..d6022c8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ On 07/07/2014 at 16:25:16 +0200, Maxime Ripard wrote : This is also the case for the sam9263, please fix it there too. -> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> +> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > --- > arch/arm/boot/dts/at91sam9g45.dtsi | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) @@ -20,19 +20,19 @@ This is also the case for the sam9263, please fix it there too. > +++ b/arch/arm/boot/dts/at91sam9g45.dtsi > @@ -75,8 +75,12 @@ > -> ramc0: ramc at ffffe400 { +> ramc0: ramc@ffffe400 { > compatible = "atmel,at91sam9g45-ddramc"; > - reg = <0xffffe400 0x200 > - 0xffffe600 0x200>; > + reg = <0xffffe400 0x200>; > + }; > + -> + ramc1: ramc at ffffe600 { +> + ramc1: ramc@ffffe600 { > + compatible = "atmel,at91sam9g45-ddramc"; > + reg = <0xffffe600 0x200>; > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > -- > 2.0.1 > @@ -41,3 +41,7 @@ This is also the case for the sam9263, please fix it there too. Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com +-- +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 59eb23a..67fe44b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,20 @@ "ref\01404743131-24569-1-git-send-email-maxime.ripard@free-electrons.com\0" "ref\01404743131-24569-4-git-send-email-maxime.ripard@free-electrons.com\0" - "From\0alexandre.belloni@free-electrons.com (Alexandre Belloni)\0" - "Subject\0[PATCH v2 03/18] AT91: G45: DT: Declare a second ram controller\0" + "ref\01404743131-24569-4-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "From\0Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Subject\0Re: [PATCH v2 03/18] AT91: G45: DT: Declare a second ram controller\0" "Date\0Mon, 7 Jul 2014 16:57:21 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0linux-PelNFVqkFnVyf+4FbqDuWQ@public.gmane.org" + Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> + Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> + dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org + dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org + Boris Brezillon <boris-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + Thomas Petazzoni <thomas-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -17,7 +28,7 @@ "\n" "This is also the case for the sam9263, please fix it there too.\n" "\n" - "> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>\n" + "> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/at91sam9g45.dtsi | 8 ++++++--\n" "> 1 file changed, 6 insertions(+), 2 deletions(-)\n" @@ -28,19 +39,19 @@ "> +++ b/arch/arm/boot/dts/at91sam9g45.dtsi\n" "> @@ -75,8 +75,12 @@\n" "> \n" - "> \t\t\tramc0: ramc at ffffe400 {\n" + "> \t\t\tramc0: ramc@ffffe400 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9g45-ddramc\";\n" "> -\t\t\t\treg = <0xffffe400 0x200\n" "> -\t\t\t\t 0xffffe600 0x200>;\n" "> +\t\t\t\treg = <0xffffe400 0x200>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tramc1: ramc at ffffe600 {\n" + "> +\t\t\tramc1: ramc@ffffe600 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-ddramc\";\n" "> +\t\t\t\treg = <0xffffe600 0x200>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tpmc: pmc at fffffc00 {\n" + "> \t\t\tpmc: pmc@fffffc00 {\n" "> -- \n" "> 2.0.1\n" "> \n" @@ -48,6 +59,10 @@ "-- \n" "Alexandre Belloni, Free Electrons\n" "Embedded Linux, Kernel and Android engineering\n" - http://free-electrons.com + "http://free-electrons.com\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 -c497e570019b4d40dfcf689a4935b7ef5ad86b4b0cc14aa3a2fa29c130a7ed65 +94d1f437bb55468fdaca7b62b8a0a5e445b0a32f9c3af6bb165334579bd83b60
diff --git a/a/1.txt b/N2/1.txt index 59149bd..f9ef94f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -20,19 +20,19 @@ This is also the case for the sam9263, please fix it there too. > +++ b/arch/arm/boot/dts/at91sam9g45.dtsi > @@ -75,8 +75,12 @@ > -> ramc0: ramc at ffffe400 { +> ramc0: ramc@ffffe400 { > compatible = "atmel,at91sam9g45-ddramc"; > - reg = <0xffffe400 0x200 > - 0xffffe600 0x200>; > + reg = <0xffffe400 0x200>; > + }; > + -> + ramc1: ramc at ffffe600 { +> + ramc1: ramc@ffffe600 { > + compatible = "atmel,at91sam9g45-ddramc"; > + reg = <0xffffe600 0x200>; > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > -- > 2.0.1 > diff --git a/a/content_digest b/N2/content_digest index 59eb23a..5f877d7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,19 @@ "ref\01404743131-24569-1-git-send-email-maxime.ripard@free-electrons.com\0" "ref\01404743131-24569-4-git-send-email-maxime.ripard@free-electrons.com\0" - "From\0alexandre.belloni@free-electrons.com (Alexandre Belloni)\0" - "Subject\0[PATCH v2 03/18] AT91: G45: DT: Declare a second ram controller\0" + "From\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" + "Subject\0Re: [PATCH v2 03/18] AT91: G45: DT: Declare a second ram controller\0" "Date\0Mon, 7 Jul 2014 16:57:21 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" + "Cc\0linux@maxim.org.za" + Nicolas Ferre <nicolas.ferre@atmel.com> + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + dwmw2@infradead.org + dbaryshkov@gmail.com + Boris Brezillon <boris@free-electrons.com> + Thomas Petazzoni <thomas@free-electrons.com> + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -28,19 +38,19 @@ "> +++ b/arch/arm/boot/dts/at91sam9g45.dtsi\n" "> @@ -75,8 +75,12 @@\n" "> \n" - "> \t\t\tramc0: ramc at ffffe400 {\n" + "> \t\t\tramc0: ramc@ffffe400 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9g45-ddramc\";\n" "> -\t\t\t\treg = <0xffffe400 0x200\n" "> -\t\t\t\t 0xffffe600 0x200>;\n" "> +\t\t\t\treg = <0xffffe400 0x200>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tramc1: ramc at ffffe600 {\n" + "> +\t\t\tramc1: ramc@ffffe600 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-ddramc\";\n" "> +\t\t\t\treg = <0xffffe600 0x200>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tpmc: pmc at fffffc00 {\n" + "> \t\t\tpmc: pmc@fffffc00 {\n" "> -- \n" "> 2.0.1\n" "> \n" @@ -50,4 +60,4 @@ "Embedded Linux, Kernel and Android engineering\n" http://free-electrons.com -c497e570019b4d40dfcf689a4935b7ef5ad86b4b0cc14aa3a2fa29c130a7ed65 +de96de6b3908645ca84bc2424f3a5751c6683987b992861cd8840ab8424fb76b
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.