diff for duplicates of <5260F959.2090705@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 04e9d57..3fe6f8d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,10 +2,10 @@ On 11/10/2013 14:43, Boris BREZILLON : > Define sama5d3 clocks in sama5d3 device tree. > Add references to the appropriate clocks in each peripheral. > -> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> +> Signed-off-by: Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org> good: -Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> +Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > --- > arch/arm/boot/dts/sama5d3.dtsi | 331 ++++++++++++++++++++++++++++++++++- @@ -53,7 +53,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "mci_clk"; > }; > -> spi0: spi at f0004000 { +> spi0: spi@f0004000 { > @@ -92,6 +103,8 @@ > dma-names = "tx", "rx"; > pinctrl-names = "default"; @@ -80,7 +80,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "t0_clk"; > }; > -> i2c0: i2c at f0014000 { +> i2c0: i2c@f0014000 { > @@ -121,6 +138,7 @@ > pinctrl-0 = <&pinctrl_i2c0>; > #address-cells = <1>; @@ -123,7 +123,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "mci_clk"; > }; > -> spi1: spi at f8008000 { +> spi1: spi@f8008000 { > @@ -187,6 +212,8 @@ > dma-names = "tx", "rx"; > pinctrl-names = "default"; @@ -186,7 +186,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "dma_clk"; > }; > -> dma1: dma-controller at ffffe800 { +> dma1: dma-controller@ffffe800 { > @@ -325,6 +364,8 @@ > reg = <0xffffe800 0x200>; > interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>; @@ -195,7 +195,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "dma_clk"; > }; > -> ramc0: ramc at ffffea00 { +> ramc0: ramc@ffffea00 { > @@ -338,6 +379,8 @@ > interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>; > pinctrl-names = "default"; @@ -212,7 +212,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&periph 6>; > }; > -> pioB: gpio at fffff400 { +> pioB: gpio@fffff400 { > @@ -636,6 +680,7 @@ > gpio-controller; > interrupt-controller; @@ -220,7 +220,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&periph 7>; > }; > -> pioC: gpio at fffff600 { +> pioC: gpio@fffff600 { > @@ -646,6 +691,7 @@ > gpio-controller; > interrupt-controller; @@ -228,7 +228,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&periph 8>; > }; > -> pioD: gpio at fffff800 { +> pioD: gpio@fffff800 { > @@ -656,6 +702,7 @@ > gpio-controller; > interrupt-controller; @@ -236,7 +236,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&periph 9>; > }; > -> pioE: gpio at fffffa00 { +> pioE: gpio@fffffa00 { > @@ -666,12 +713,286 @@ > gpio-controller; > interrupt-controller; @@ -245,7 +245,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > - compatible = "atmel,at91rm9200-pmc"; > + compatible = "atmel,sama5d3-pmc"; > reg = <0xfffffc00 0x120>; @@ -524,7 +524,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > }; > -> rstc at fffffe00 { +> rstc@fffffe00 { > @@ -683,6 +1004,7 @@ > compatible = "atmel,at91sam9260-pit"; > reg = <0xfffffe30 0xf>; @@ -532,7 +532,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&mck>; > }; > -> watchdog at fffffe40 { +> watchdog@fffffe40 { > @@ -705,6 +1027,8 @@ > reg = <0x00500000 0x100000 > 0xf8030000 0x4000>; @@ -569,7 +569,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + can0_clk { > + atmel,clk-id = <40>; @@ -583,7 +583,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> can0: can at f000c000 { +> can0: can@f000c000 { > compatible = "atmel,at91sam9x5-can"; > reg = <0xf000c000 0x300>; > interrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>; @@ -611,7 +611,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + macb1_clk { > + atmel,clk-id = <35>; @@ -619,7 +619,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> macb1: ethernet at f802c000 { +> macb1: ethernet@f802c000 { > compatible = "cdns,at32ap7000-macb", "cdns,macb"; > reg = <0xf802c000 0x100>; > interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>; @@ -638,7 +638,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + macb0_clk { > + atmel,clk-id = <34>; @@ -646,7 +646,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> macb0: ethernet at f0028000 { +> macb0: ethernet@f0028000 { > compatible = "cdns,pc302-gem", "cdns,gem"; > reg = <0xf0028000 0x100>; > interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>; @@ -666,7 +666,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > + -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + lcdc_clk { > + atmel,clk-id = <36>; @@ -699,7 +699,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + mci2_clk { > + atmel,clk-id = <23>; @@ -707,7 +707,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> mmc2: mmc at f8004000 { +> mmc2: mmc@f8004000 { > compatible = "atmel,hsmci"; > reg = <0xf8004000 0x600>; > @@ -38,6 +47,8 @@ @@ -735,7 +735,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > ahb { > apb { -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + tcb1_clk { > + atmel,clk-id = <27>; @@ -744,7 +744,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> tcb1: timer at f8014000 { +> tcb1: timer@f8014000 { > compatible = "atmel,at91sam9x5-tcb"; > reg = <0xf8014000 0x100>; > interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>; @@ -769,7 +769,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + uart0_clk { > + atmel,clk-id = <16>; @@ -783,7 +783,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> uart0: serial at f0024000 { +> uart0: serial@f0024000 { > compatible = "atmel,at91sam9260-usart"; > reg = <0xf0024000 0x200>; > interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>; @@ -808,3 +808,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> -- Nicolas Ferre +-- +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 1a031ab..15245f7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,32 @@ "ref\01381495416-15928-1-git-send-email-b.brezillon@overkiz.com\0" "ref\01381495416-15928-4-git-send-email-b.brezillon@overkiz.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH v2 3/6] ARM: at91/dt: define sama5d3 clocks\0" + "ref\01381495416-15928-4-git-send-email-b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org\0" + "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH v2 3/6] ARM: at91/dt: define sama5d3 clocks\0" "Date\0Fri, 18 Oct 2013 11:03:21 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>" + Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + Andrew Victor <linux-PelNFVqkFnVyf+4FbqDuWQ@public.gmane.org> + Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> + " Mike Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 11/10/2013 14:43, Boris BREZILLON :\n" "> Define sama5d3 clocks in sama5d3 device tree.\n" "> Add references to the appropriate clocks in each peripheral.\n" ">\n" - "> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>\n" + "> Signed-off-by: Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>\n" "\n" "good:\n" - "Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n" + "Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "\n" "> ---\n" "> arch/arm/boot/dts/sama5d3.dtsi | 331 ++++++++++++++++++++++++++++++++++-\n" @@ -61,7 +74,7 @@ "> +\t\t\t\tclock-names = \"mci_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\tspi0: spi at f0004000 {\n" + "> \t\t\tspi0: spi@f0004000 {\n" "> @@ -92,6 +103,8 @@\n" "> \t\t\t\tdma-names = \"tx\", \"rx\";\n" "> \t\t\t\tpinctrl-names = \"default\";\n" @@ -88,7 +101,7 @@ "> +\t\t\t\tclock-names = \"t0_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\ti2c0: i2c at f0014000 {\n" + "> \t\t\ti2c0: i2c@f0014000 {\n" "> @@ -121,6 +138,7 @@\n" "> \t\t\t\tpinctrl-0 = <&pinctrl_i2c0>;\n" "> \t\t\t\t#address-cells = <1>;\n" @@ -131,7 +144,7 @@ "> +\t\t\t\tclock-names = \"mci_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\tspi1: spi at f8008000 {\n" + "> \t\t\tspi1: spi@f8008000 {\n" "> @@ -187,6 +212,8 @@\n" "> \t\t\t\tdma-names = \"tx\", \"rx\";\n" "> \t\t\t\tpinctrl-names = \"default\";\n" @@ -194,7 +207,7 @@ "> +\t\t\t\tclock-names = \"dma_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\tdma1: dma-controller at ffffe800 {\n" + "> \t\t\tdma1: dma-controller@ffffe800 {\n" "> @@ -325,6 +364,8 @@\n" "> \t\t\t\treg = <0xffffe800 0x200>;\n" "> \t\t\t\tinterrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -203,7 +216,7 @@ "> +\t\t\t\tclock-names = \"dma_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\tramc0: ramc at ffffea00 {\n" + "> \t\t\tramc0: ramc@ffffea00 {\n" "> @@ -338,6 +379,8 @@\n" "> \t\t\t\tinterrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>;\n" "> \t\t\t\tpinctrl-names = \"default\";\n" @@ -220,7 +233,7 @@ "> +\t\t\t\t\tclocks = <&periph 6>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tpioB: gpio at fffff400 {\n" + "> \t\t\t\tpioB: gpio@fffff400 {\n" "> @@ -636,6 +680,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -228,7 +241,7 @@ "> +\t\t\t\t\tclocks = <&periph 7>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tpioC: gpio at fffff600 {\n" + "> \t\t\t\tpioC: gpio@fffff600 {\n" "> @@ -646,6 +691,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -236,7 +249,7 @@ "> +\t\t\t\t\tclocks = <&periph 8>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tpioD: gpio at fffff800 {\n" + "> \t\t\t\tpioD: gpio@fffff800 {\n" "> @@ -656,6 +702,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -244,7 +257,7 @@ "> +\t\t\t\t\tclocks = <&periph 9>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tpioE: gpio at fffffa00 {\n" + "> \t\t\t\tpioE: gpio@fffffa00 {\n" "> @@ -666,12 +713,286 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -253,7 +266,7 @@ "> \t\t\t\t};\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\tcompatible = \"atmel,sama5d3-pmc\";\n" "> \t\t\t\treg = <0xfffffc00 0x120>;\n" @@ -532,7 +545,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> \t\t\trstc at fffffe00 {\n" + "> \t\t\trstc@fffffe00 {\n" "> @@ -683,6 +1004,7 @@\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-pit\";\n" "> \t\t\t\treg = <0xfffffe30 0xf>;\n" @@ -540,7 +553,7 @@ "> +\t\t\t\tclocks = <&mck>;\n" "> \t\t\t};\n" ">\n" - "> \t\t\twatchdog at fffffe40 {\n" + "> \t\t\twatchdog@fffffe40 {\n" "> @@ -705,6 +1027,8 @@\n" "> \t\t\treg = <0x00500000 0x100000\n" "> \t\t\t 0xf8030000 0x4000>;\n" @@ -577,7 +590,7 @@ ">\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tcan0_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <40>;\n" @@ -591,7 +604,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tcan0: can at f000c000 {\n" + "> \t\t\tcan0: can@f000c000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-can\";\n" "> \t\t\t\treg = <0xf000c000 0x300>;\n" "> \t\t\t\tinterrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -619,7 +632,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tmacb1_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <35>;\n" @@ -627,7 +640,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmacb1: ethernet at f802c000 {\n" + "> \t\t\tmacb1: ethernet@f802c000 {\n" "> \t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> \t\t\t\treg = <0xf802c000 0x100>;\n" "> \t\t\t\tinterrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -646,7 +659,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tmacb0_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <34>;\n" @@ -654,7 +667,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmacb0: ethernet at f0028000 {\n" + "> \t\t\tmacb0: ethernet@f0028000 {\n" "> \t\t\t\tcompatible = \"cdns,pc302-gem\", \"cdns,gem\";\n" "> \t\t\t\treg = <0xf0028000 0x100>;\n" "> \t\t\t\tinterrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -674,7 +687,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tlcdc_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <36>;\n" @@ -707,7 +720,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tmci2_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <23>;\n" @@ -715,7 +728,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmmc2: mmc at f8004000 {\n" + "> \t\t\tmmc2: mmc@f8004000 {\n" "> \t\t\t\tcompatible = \"atmel,hsmci\";\n" "> \t\t\t\treg = <0xf8004000 0x600>;\n" "> @@ -38,6 +47,8 @@\n" @@ -743,7 +756,7 @@ ">\n" "> \tahb {\n" "> \t\tapb {\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\ttcb1_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <27>;\n" @@ -752,7 +765,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\ttcb1: timer at f8014000 {\n" + "> \t\t\ttcb1: timer@f8014000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-tcb\";\n" "> \t\t\t\treg = <0xf8014000 0x100>;\n" "> \t\t\t\tinterrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -777,7 +790,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tuart0_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <16>;\n" @@ -791,7 +804,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart0: serial at f0024000 {\n" + "> \t\t\tuart0: serial@f0024000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> \t\t\t\treg = <0xf0024000 0x200>;\n" "> \t\t\t\tinterrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;\n" @@ -815,6 +828,10 @@ "\n" "\n" "-- \n" - Nicolas Ferre + "Nicolas Ferre\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 -411a2330541c84d6cae0745eb08aff5c71b43d6fe0d8db197249c8eedccc389a +145c023fb27233347b4dbcf0c3db86a6f4872b56d7fc29dfd5664c1c9d368102
diff --git a/a/1.txt b/N2/1.txt index 04e9d57..538846e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -53,7 +53,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "mci_clk"; > }; > -> spi0: spi at f0004000 { +> spi0: spi@f0004000 { > @@ -92,6 +103,8 @@ > dma-names = "tx", "rx"; > pinctrl-names = "default"; @@ -80,7 +80,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "t0_clk"; > }; > -> i2c0: i2c at f0014000 { +> i2c0: i2c@f0014000 { > @@ -121,6 +138,7 @@ > pinctrl-0 = <&pinctrl_i2c0>; > #address-cells = <1>; @@ -123,7 +123,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "mci_clk"; > }; > -> spi1: spi at f8008000 { +> spi1: spi@f8008000 { > @@ -187,6 +212,8 @@ > dma-names = "tx", "rx"; > pinctrl-names = "default"; @@ -186,7 +186,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "dma_clk"; > }; > -> dma1: dma-controller at ffffe800 { +> dma1: dma-controller@ffffe800 { > @@ -325,6 +364,8 @@ > reg = <0xffffe800 0x200>; > interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>; @@ -195,7 +195,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clock-names = "dma_clk"; > }; > -> ramc0: ramc at ffffea00 { +> ramc0: ramc@ffffea00 { > @@ -338,6 +379,8 @@ > interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>; > pinctrl-names = "default"; @@ -212,7 +212,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&periph 6>; > }; > -> pioB: gpio at fffff400 { +> pioB: gpio@fffff400 { > @@ -636,6 +680,7 @@ > gpio-controller; > interrupt-controller; @@ -220,7 +220,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&periph 7>; > }; > -> pioC: gpio at fffff600 { +> pioC: gpio@fffff600 { > @@ -646,6 +691,7 @@ > gpio-controller; > interrupt-controller; @@ -228,7 +228,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&periph 8>; > }; > -> pioD: gpio at fffff800 { +> pioD: gpio@fffff800 { > @@ -656,6 +702,7 @@ > gpio-controller; > interrupt-controller; @@ -236,7 +236,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&periph 9>; > }; > -> pioE: gpio at fffffa00 { +> pioE: gpio@fffffa00 { > @@ -666,12 +713,286 @@ > gpio-controller; > interrupt-controller; @@ -245,7 +245,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > - compatible = "atmel,at91rm9200-pmc"; > + compatible = "atmel,sama5d3-pmc"; > reg = <0xfffffc00 0x120>; @@ -524,7 +524,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > }; > -> rstc at fffffe00 { +> rstc@fffffe00 { > @@ -683,6 +1004,7 @@ > compatible = "atmel,at91sam9260-pit"; > reg = <0xfffffe30 0xf>; @@ -532,7 +532,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + clocks = <&mck>; > }; > -> watchdog at fffffe40 { +> watchdog@fffffe40 { > @@ -705,6 +1027,8 @@ > reg = <0x00500000 0x100000 > 0xf8030000 0x4000>; @@ -569,7 +569,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + can0_clk { > + atmel,clk-id = <40>; @@ -583,7 +583,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> can0: can at f000c000 { +> can0: can@f000c000 { > compatible = "atmel,at91sam9x5-can"; > reg = <0xf000c000 0x300>; > interrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>; @@ -611,7 +611,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + macb1_clk { > + atmel,clk-id = <35>; @@ -619,7 +619,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> macb1: ethernet at f802c000 { +> macb1: ethernet@f802c000 { > compatible = "cdns,at32ap7000-macb", "cdns,macb"; > reg = <0xf802c000 0x100>; > interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>; @@ -638,7 +638,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + macb0_clk { > + atmel,clk-id = <34>; @@ -646,7 +646,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> macb0: ethernet at f0028000 { +> macb0: ethernet@f0028000 { > compatible = "cdns,pc302-gem", "cdns,gem"; > reg = <0xf0028000 0x100>; > interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>; @@ -666,7 +666,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > + -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + lcdc_clk { > + atmel,clk-id = <36>; @@ -699,7 +699,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + mci2_clk { > + atmel,clk-id = <23>; @@ -707,7 +707,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> mmc2: mmc at f8004000 { +> mmc2: mmc@f8004000 { > compatible = "atmel,hsmci"; > reg = <0xf8004000 0x600>; > @@ -38,6 +47,8 @@ @@ -735,7 +735,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > ahb { > apb { -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + tcb1_clk { > + atmel,clk-id = <27>; @@ -744,7 +744,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> tcb1: timer at f8014000 { +> tcb1: timer@f8014000 { > compatible = "atmel,at91sam9x5-tcb"; > reg = <0xf8014000 0x100>; > interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>; @@ -769,7 +769,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + uart0_clk { > + atmel,clk-id = <16>; @@ -783,7 +783,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > + }; > + -> uart0: serial at f0024000 { +> uart0: serial@f0024000 { > compatible = "atmel,at91sam9260-usart"; > reg = <0xf0024000 0x200>; > interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>; diff --git a/a/content_digest b/N2/content_digest index 1a031ab..9df5ee3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,21 @@ "ref\01381495416-15928-1-git-send-email-b.brezillon@overkiz.com\0" "ref\01381495416-15928-4-git-send-email-b.brezillon@overkiz.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH v2 3/6] ARM: at91/dt: define sama5d3 clocks\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH v2 3/6] ARM: at91/dt: define sama5d3 clocks\0" "Date\0Fri, 18 Oct 2013 11:03:21 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris BREZILLON <b.brezillon@overkiz.com>" + Rob Herring <rob.herring@calxeda.com> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Russell King <linux@arm.linux.org.uk> + Andrew Victor <linux@maxim.org.za> + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + " Mike Turquette <mturquette@linaro.org>\0" + "Cc\0<devicetree@vger.kernel.org>" + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On 11/10/2013 14:43, Boris BREZILLON :\n" @@ -61,7 +73,7 @@ "> +\t\t\t\tclock-names = \"mci_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\tspi0: spi at f0004000 {\n" + "> \t\t\tspi0: spi@f0004000 {\n" "> @@ -92,6 +103,8 @@\n" "> \t\t\t\tdma-names = \"tx\", \"rx\";\n" "> \t\t\t\tpinctrl-names = \"default\";\n" @@ -88,7 +100,7 @@ "> +\t\t\t\tclock-names = \"t0_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\ti2c0: i2c at f0014000 {\n" + "> \t\t\ti2c0: i2c@f0014000 {\n" "> @@ -121,6 +138,7 @@\n" "> \t\t\t\tpinctrl-0 = <&pinctrl_i2c0>;\n" "> \t\t\t\t#address-cells = <1>;\n" @@ -131,7 +143,7 @@ "> +\t\t\t\tclock-names = \"mci_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\tspi1: spi at f8008000 {\n" + "> \t\t\tspi1: spi@f8008000 {\n" "> @@ -187,6 +212,8 @@\n" "> \t\t\t\tdma-names = \"tx\", \"rx\";\n" "> \t\t\t\tpinctrl-names = \"default\";\n" @@ -194,7 +206,7 @@ "> +\t\t\t\tclock-names = \"dma_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\tdma1: dma-controller at ffffe800 {\n" + "> \t\t\tdma1: dma-controller@ffffe800 {\n" "> @@ -325,6 +364,8 @@\n" "> \t\t\t\treg = <0xffffe800 0x200>;\n" "> \t\t\t\tinterrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -203,7 +215,7 @@ "> +\t\t\t\tclock-names = \"dma_clk\";\n" "> \t\t\t};\n" ">\n" - "> \t\t\tramc0: ramc at ffffea00 {\n" + "> \t\t\tramc0: ramc@ffffea00 {\n" "> @@ -338,6 +379,8 @@\n" "> \t\t\t\tinterrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>;\n" "> \t\t\t\tpinctrl-names = \"default\";\n" @@ -220,7 +232,7 @@ "> +\t\t\t\t\tclocks = <&periph 6>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tpioB: gpio at fffff400 {\n" + "> \t\t\t\tpioB: gpio@fffff400 {\n" "> @@ -636,6 +680,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -228,7 +240,7 @@ "> +\t\t\t\t\tclocks = <&periph 7>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tpioC: gpio at fffff600 {\n" + "> \t\t\t\tpioC: gpio@fffff600 {\n" "> @@ -646,6 +691,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -236,7 +248,7 @@ "> +\t\t\t\t\tclocks = <&periph 8>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tpioD: gpio at fffff800 {\n" + "> \t\t\t\tpioD: gpio@fffff800 {\n" "> @@ -656,6 +702,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -244,7 +256,7 @@ "> +\t\t\t\t\tclocks = <&periph 9>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tpioE: gpio at fffffa00 {\n" + "> \t\t\t\tpioE: gpio@fffffa00 {\n" "> @@ -666,12 +713,286 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -253,7 +265,7 @@ "> \t\t\t\t};\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\tcompatible = \"atmel,sama5d3-pmc\";\n" "> \t\t\t\treg = <0xfffffc00 0x120>;\n" @@ -532,7 +544,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> \t\t\trstc at fffffe00 {\n" + "> \t\t\trstc@fffffe00 {\n" "> @@ -683,6 +1004,7 @@\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-pit\";\n" "> \t\t\t\treg = <0xfffffe30 0xf>;\n" @@ -540,7 +552,7 @@ "> +\t\t\t\tclocks = <&mck>;\n" "> \t\t\t};\n" ">\n" - "> \t\t\twatchdog at fffffe40 {\n" + "> \t\t\twatchdog@fffffe40 {\n" "> @@ -705,6 +1027,8 @@\n" "> \t\t\treg = <0x00500000 0x100000\n" "> \t\t\t 0xf8030000 0x4000>;\n" @@ -577,7 +589,7 @@ ">\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tcan0_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <40>;\n" @@ -591,7 +603,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tcan0: can at f000c000 {\n" + "> \t\t\tcan0: can@f000c000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-can\";\n" "> \t\t\t\treg = <0xf000c000 0x300>;\n" "> \t\t\t\tinterrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -619,7 +631,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tmacb1_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <35>;\n" @@ -627,7 +639,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmacb1: ethernet at f802c000 {\n" + "> \t\t\tmacb1: ethernet@f802c000 {\n" "> \t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> \t\t\t\treg = <0xf802c000 0x100>;\n" "> \t\t\t\tinterrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -646,7 +658,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tmacb0_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <34>;\n" @@ -654,7 +666,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmacb0: ethernet at f0028000 {\n" + "> \t\t\tmacb0: ethernet@f0028000 {\n" "> \t\t\t\tcompatible = \"cdns,pc302-gem\", \"cdns,gem\";\n" "> \t\t\t\treg = <0xf0028000 0x100>;\n" "> \t\t\t\tinterrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -674,7 +686,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tlcdc_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <36>;\n" @@ -707,7 +719,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tmci2_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <23>;\n" @@ -715,7 +727,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmmc2: mmc at f8004000 {\n" + "> \t\t\tmmc2: mmc@f8004000 {\n" "> \t\t\t\tcompatible = \"atmel,hsmci\";\n" "> \t\t\t\treg = <0xf8004000 0x600>;\n" "> @@ -38,6 +47,8 @@\n" @@ -743,7 +755,7 @@ ">\n" "> \tahb {\n" "> \t\tapb {\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\ttcb1_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <27>;\n" @@ -752,7 +764,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\ttcb1: timer at f8014000 {\n" + "> \t\t\ttcb1: timer@f8014000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-tcb\";\n" "> \t\t\t\treg = <0xf8014000 0x100>;\n" "> \t\t\t\tinterrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -777,7 +789,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiph: periphck {\n" "> +\t\t\t\t\tuart0_clk {\n" "> +\t\t\t\t\t\tatmel,clk-id = <16>;\n" @@ -791,7 +803,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tuart0: serial at f0024000 {\n" + "> \t\t\tuart0: serial@f0024000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> \t\t\t\treg = <0xf0024000 0x200>;\n" "> \t\t\t\tinterrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;\n" @@ -817,4 +829,4 @@ "-- \n" Nicolas Ferre -411a2330541c84d6cae0745eb08aff5c71b43d6fe0d8db197249c8eedccc389a +4c41f3244379ea79ae8c34dcdbc84b2c5a7c6d04b6bf10d705f44bf322ae6d6f
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.