diff for duplicates of <20140414085643.GK2967@piout.net> diff --git a/a/1.txt b/N1/1.txt index 78ed320..91bbcfb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On 14/04/2014 at 10:16:37 +0200, Boris Brezillon wrote : > Define sam9n12 clocks and make use of them in peripheral definitions. > -> Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> +> Signed-off-by: Boris BREZILLON <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > --- > arch/arm/boot/dts/at91sam9n12.dtsi | 350 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 348 insertions(+), 2 deletions(-) @@ -50,7 +50,7 @@ organisation of Linux rather than any conscious decision." > @@ -75,8 +90,280 @@ > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > - compatible = "atmel,at91rm9200-pmc"; > - reg = <0xfffffc00 0x100>; > + compatible = "atmel,at91sam9n12-pmc"; @@ -329,7 +329,7 @@ organisation of Linux rather than any conscious decision." > + }; > }; > -> rstc at fffffe00 { +> rstc@fffffe00 { > @@ -88,6 +375,7 @@ > compatible = "atmel,at91sam9260-pit"; > reg = <0xfffffe30 0xf>; @@ -337,12 +337,12 @@ organisation of Linux rather than any conscious decision." > + clocks = <&mck>; > }; > -> shdwc at fffffe10 { +> shdwc@fffffe10 { > @@ -95,12 +383,38 @@ > reg = <0xfffffe10 0x10>; > }; > -> + sckc at fffffe50 { +> + sckc@fffffe50 { > + compatible = "atmel,at91sam9x5-sckc"; > + reg = <0xfffffe50 0x4>; > + @@ -366,7 +366,7 @@ organisation of Linux rather than any conscious decision." > + }; > + }; > + -> mmc0: mmc at f0008000 { +> mmc0: mmc@f0008000 { > compatible = "atmel,hsmci"; > reg = <0xf0008000 0x600>; > interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>; @@ -385,7 +385,7 @@ organisation of Linux rather than any conscious decision." > + clock-names = "t0_clk"; > }; > -> tcb1: timer at f800c000 { +> tcb1: timer@f800c000 { > compatible = "atmel,at91sam9x5-tcb"; > reg = <0xf800c000 0x100>; > interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>; @@ -393,7 +393,7 @@ organisation of Linux rather than any conscious decision." > + clock-names = "t0_clk"; > }; > -> dma: dma-controller at ffffec00 { +> dma: dma-controller@ffffec00 { > @@ -123,6 +441,8 @@ > reg = <0xffffec00 0x200>; > interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; @@ -402,7 +402,7 @@ organisation of Linux rather than any conscious decision." > + clock-names = "dma_clk"; > }; > -> pinctrl at fffff400 { +> pinctrl@fffff400 { > @@ -392,6 +712,7 @@ > gpio-controller; > interrupt-controller; @@ -410,7 +410,7 @@ organisation of Linux rather than any conscious decision." > + clocks = <&pioAB_clk>; > }; > -> pioB: gpio at fffff600 { +> pioB: gpio@fffff600 { > @@ -402,6 +723,7 @@ > gpio-controller; > interrupt-controller; @@ -418,7 +418,7 @@ organisation of Linux rather than any conscious decision." > + clocks = <&pioAB_clk>; > }; > -> pioC: gpio at fffff800 { +> pioC: gpio@fffff800 { > @@ -412,6 +734,7 @@ > gpio-controller; > interrupt-controller; @@ -426,7 +426,7 @@ organisation of Linux rather than any conscious decision." > + clocks = <&pioCD_clk>; > }; > -> pioD: gpio at fffffa00 { +> pioD: gpio@fffffa00 { > @@ -422,6 +745,7 @@ > gpio-controller; > interrupt-controller; @@ -549,3 +549,7 @@ organisation of Linux rather than any conscious decision." 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 7f40514..7ef3773 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,22 @@ "ref\01397463399-11771-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01397463399-11771-3-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0alexandre.belloni@free-electrons.com (Alexandre Belloni)\0" - "Subject\0[PATCH 2/4] ARM: at91/dt: define sam9n12 clocks\0" + "ref\01397463399-11771-3-git-send-email-boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "From\0Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Subject\0Re: [PATCH 2/4] ARM: at91/dt: define sam9n12 clocks\0" "Date\0Mon, 14 Apr 2014 10:56:43 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris BREZILLON <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>" + Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> + Bo Shen <voice.shen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 14/04/2014 at 10:16:37 +0200, Boris Brezillon wrote :\n" "> Define sam9n12 clocks and make use of them in peripheral definitions.\n" "> \n" - "> Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>\n" + "> Signed-off-by: Boris BREZILLON <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/at91sam9n12.dtsi | 350 ++++++++++++++++++++++++++++++++++++-\n" "> 1 file changed, 348 insertions(+), 2 deletions(-)\n" @@ -58,7 +65,7 @@ "> @@ -75,8 +90,280 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tpmc: pmc at fffffc00 {\n" + "> \t\t\tpmc: pmc@fffffc00 {\n" "> -\t\t\t\tcompatible = \"atmel,at91rm9200-pmc\";\n" "> -\t\t\t\treg = <0xfffffc00 0x100>;\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9n12-pmc\";\n" @@ -337,7 +344,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\trstc at fffffe00 {\n" + "> \t\t\trstc@fffffe00 {\n" "> @@ -88,6 +375,7 @@\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-pit\";\n" "> \t\t\t\treg = <0xfffffe30 0xf>;\n" @@ -345,12 +352,12 @@ "> +\t\t\t\tclocks = <&mck>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tshdwc at fffffe10 {\n" + "> \t\t\tshdwc@fffffe10 {\n" "> @@ -95,12 +383,38 @@\n" "> \t\t\t\treg = <0xfffffe10 0x10>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tsckc at fffffe50 {\n" + "> +\t\t\tsckc@fffffe50 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9x5-sckc\";\n" "> +\t\t\t\treg = <0xfffffe50 0x4>;\n" "> +\n" @@ -374,7 +381,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmmc0: mmc at f0008000 {\n" + "> \t\t\tmmc0: mmc@f0008000 {\n" "> \t\t\t\tcompatible = \"atmel,hsmci\";\n" "> \t\t\t\treg = <0xf0008000 0x600>;\n" "> \t\t\t\tinterrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -393,7 +400,7 @@ "> +\t\t\t\tclock-names = \"t0_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\ttcb1: timer at f800c000 {\n" + "> \t\t\ttcb1: timer@f800c000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-tcb\";\n" "> \t\t\t\treg = <0xf800c000 0x100>;\n" "> \t\t\t\tinterrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -401,7 +408,7 @@ "> +\t\t\t\tclock-names = \"t0_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tdma: dma-controller at ffffec00 {\n" + "> \t\t\tdma: dma-controller@ffffec00 {\n" "> @@ -123,6 +441,8 @@\n" "> \t\t\t\treg = <0xffffec00 0x200>;\n" "> \t\t\t\tinterrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -410,7 +417,7 @@ "> +\t\t\t\tclock-names = \"dma_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tpinctrl at fffff400 {\n" + "> \t\t\tpinctrl@fffff400 {\n" "> @@ -392,6 +712,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -418,7 +425,7 @@ "> +\t\t\t\t\tclocks = <&pioAB_clk>;\n" "> \t\t\t\t};\n" "> \n" - "> \t\t\t\tpioB: gpio at fffff600 {\n" + "> \t\t\t\tpioB: gpio@fffff600 {\n" "> @@ -402,6 +723,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -426,7 +433,7 @@ "> +\t\t\t\t\tclocks = <&pioAB_clk>;\n" "> \t\t\t\t};\n" "> \n" - "> \t\t\t\tpioC: gpio at fffff800 {\n" + "> \t\t\t\tpioC: gpio@fffff800 {\n" "> @@ -412,6 +734,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -434,7 +441,7 @@ "> +\t\t\t\t\tclocks = <&pioCD_clk>;\n" "> \t\t\t\t};\n" "> \n" - "> \t\t\t\tpioD: gpio at fffffa00 {\n" + "> \t\t\t\tpioD: gpio@fffffa00 {\n" "> @@ -422,6 +745,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -556,6 +563,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 -9a2d2018679bf916b4b445d3f3942dc0edc8d42dfac45e0a0ed3e3c178be94b2 +2268aff03f816bc447951edbdfda48ce5eadd5ad419ae31ad26d3c32ec746201
diff --git a/a/1.txt b/N2/1.txt index 78ed320..5dd48f9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -50,7 +50,7 @@ organisation of Linux rather than any conscious decision." > @@ -75,8 +90,280 @@ > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > - compatible = "atmel,at91rm9200-pmc"; > - reg = <0xfffffc00 0x100>; > + compatible = "atmel,at91sam9n12-pmc"; @@ -329,7 +329,7 @@ organisation of Linux rather than any conscious decision." > + }; > }; > -> rstc at fffffe00 { +> rstc@fffffe00 { > @@ -88,6 +375,7 @@ > compatible = "atmel,at91sam9260-pit"; > reg = <0xfffffe30 0xf>; @@ -337,12 +337,12 @@ organisation of Linux rather than any conscious decision." > + clocks = <&mck>; > }; > -> shdwc at fffffe10 { +> shdwc@fffffe10 { > @@ -95,12 +383,38 @@ > reg = <0xfffffe10 0x10>; > }; > -> + sckc at fffffe50 { +> + sckc@fffffe50 { > + compatible = "atmel,at91sam9x5-sckc"; > + reg = <0xfffffe50 0x4>; > + @@ -366,7 +366,7 @@ organisation of Linux rather than any conscious decision." > + }; > + }; > + -> mmc0: mmc at f0008000 { +> mmc0: mmc@f0008000 { > compatible = "atmel,hsmci"; > reg = <0xf0008000 0x600>; > interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>; @@ -385,7 +385,7 @@ organisation of Linux rather than any conscious decision." > + clock-names = "t0_clk"; > }; > -> tcb1: timer at f800c000 { +> tcb1: timer@f800c000 { > compatible = "atmel,at91sam9x5-tcb"; > reg = <0xf800c000 0x100>; > interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>; @@ -393,7 +393,7 @@ organisation of Linux rather than any conscious decision." > + clock-names = "t0_clk"; > }; > -> dma: dma-controller at ffffec00 { +> dma: dma-controller@ffffec00 { > @@ -123,6 +441,8 @@ > reg = <0xffffec00 0x200>; > interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; @@ -402,7 +402,7 @@ organisation of Linux rather than any conscious decision." > + clock-names = "dma_clk"; > }; > -> pinctrl at fffff400 { +> pinctrl@fffff400 { > @@ -392,6 +712,7 @@ > gpio-controller; > interrupt-controller; @@ -410,7 +410,7 @@ organisation of Linux rather than any conscious decision." > + clocks = <&pioAB_clk>; > }; > -> pioB: gpio at fffff600 { +> pioB: gpio@fffff600 { > @@ -402,6 +723,7 @@ > gpio-controller; > interrupt-controller; @@ -418,7 +418,7 @@ organisation of Linux rather than any conscious decision." > + clocks = <&pioAB_clk>; > }; > -> pioC: gpio at fffff800 { +> pioC: gpio@fffff800 { > @@ -412,6 +734,7 @@ > gpio-controller; > interrupt-controller; @@ -426,7 +426,7 @@ organisation of Linux rather than any conscious decision." > + clocks = <&pioCD_clk>; > }; > -> pioD: gpio at fffffa00 { +> pioD: gpio@fffffa00 { > @@ -422,6 +745,7 @@ > gpio-controller; > interrupt-controller; diff --git a/a/content_digest b/N2/content_digest index 7f40514..5ae0f96 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,15 @@ "ref\01397463399-11771-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01397463399-11771-3-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0alexandre.belloni@free-electrons.com (Alexandre Belloni)\0" - "Subject\0[PATCH 2/4] ARM: at91/dt: define sam9n12 clocks\0" + "From\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" + "Subject\0Re: [PATCH 2/4] ARM: at91/dt: define sam9n12 clocks\0" "Date\0Mon, 14 Apr 2014 10:56:43 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris BREZILLON <boris.brezillon@free-electrons.com>\0" + "Cc\0Nicolas Ferre <nicolas.ferre@atmel.com>" + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + Bo Shen <voice.shen@atmel.com> + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 14/04/2014 at 10:16:37 +0200, Boris Brezillon wrote :\n" @@ -58,7 +64,7 @@ "> @@ -75,8 +90,280 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tpmc: pmc at fffffc00 {\n" + "> \t\t\tpmc: pmc@fffffc00 {\n" "> -\t\t\t\tcompatible = \"atmel,at91rm9200-pmc\";\n" "> -\t\t\t\treg = <0xfffffc00 0x100>;\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9n12-pmc\";\n" @@ -337,7 +343,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\trstc at fffffe00 {\n" + "> \t\t\trstc@fffffe00 {\n" "> @@ -88,6 +375,7 @@\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-pit\";\n" "> \t\t\t\treg = <0xfffffe30 0xf>;\n" @@ -345,12 +351,12 @@ "> +\t\t\t\tclocks = <&mck>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tshdwc at fffffe10 {\n" + "> \t\t\tshdwc@fffffe10 {\n" "> @@ -95,12 +383,38 @@\n" "> \t\t\t\treg = <0xfffffe10 0x10>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tsckc at fffffe50 {\n" + "> +\t\t\tsckc@fffffe50 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9x5-sckc\";\n" "> +\t\t\t\treg = <0xfffffe50 0x4>;\n" "> +\n" @@ -374,7 +380,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmmc0: mmc at f0008000 {\n" + "> \t\t\tmmc0: mmc@f0008000 {\n" "> \t\t\t\tcompatible = \"atmel,hsmci\";\n" "> \t\t\t\treg = <0xf0008000 0x600>;\n" "> \t\t\t\tinterrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -393,7 +399,7 @@ "> +\t\t\t\tclock-names = \"t0_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\ttcb1: timer at f800c000 {\n" + "> \t\t\ttcb1: timer@f800c000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-tcb\";\n" "> \t\t\t\treg = <0xf800c000 0x100>;\n" "> \t\t\t\tinterrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -401,7 +407,7 @@ "> +\t\t\t\tclock-names = \"t0_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tdma: dma-controller at ffffec00 {\n" + "> \t\t\tdma: dma-controller@ffffec00 {\n" "> @@ -123,6 +441,8 @@\n" "> \t\t\t\treg = <0xffffec00 0x200>;\n" "> \t\t\t\tinterrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -410,7 +416,7 @@ "> +\t\t\t\tclock-names = \"dma_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tpinctrl at fffff400 {\n" + "> \t\t\tpinctrl@fffff400 {\n" "> @@ -392,6 +712,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -418,7 +424,7 @@ "> +\t\t\t\t\tclocks = <&pioAB_clk>;\n" "> \t\t\t\t};\n" "> \n" - "> \t\t\t\tpioB: gpio at fffff600 {\n" + "> \t\t\t\tpioB: gpio@fffff600 {\n" "> @@ -402,6 +723,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -426,7 +432,7 @@ "> +\t\t\t\t\tclocks = <&pioAB_clk>;\n" "> \t\t\t\t};\n" "> \n" - "> \t\t\t\tpioC: gpio at fffff800 {\n" + "> \t\t\t\tpioC: gpio@fffff800 {\n" "> @@ -412,6 +734,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -434,7 +440,7 @@ "> +\t\t\t\t\tclocks = <&pioCD_clk>;\n" "> \t\t\t\t};\n" "> \n" - "> \t\t\t\tpioD: gpio at fffffa00 {\n" + "> \t\t\t\tpioD: gpio@fffffa00 {\n" "> @@ -422,6 +745,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -558,4 +564,4 @@ "Embedded Linux, Kernel and Android engineering\n" http://free-electrons.com -9a2d2018679bf916b4b445d3f3942dc0edc8d42dfac45e0a0ed3e3c178be94b2 +6935556b54b1cdb69483203354ce1a45d606ee47e11e077be9025eb0ccdf0629
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.