diff for duplicates of <5277A737.5080705@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 6297c0b..0f1564e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -62,7 +62,7 @@ Bye, > + clock-names = "mci_clk"; > }; > -> spi0: spi at f0004000 { +> spi0: spi@f0004000 { > @@ -92,6 +103,8 @@ > dma-names = "tx", "rx"; > pinctrl-names = "default"; @@ -89,7 +89,7 @@ Bye, > + clock-names = "t0_clk"; > }; > -> i2c0: i2c at f0014000 { +> i2c0: i2c@f0014000 { > @@ -121,6 +138,7 @@ > pinctrl-0 = <&pinctrl_i2c0>; > #address-cells = <1>; @@ -132,7 +132,7 @@ Bye, > + clock-names = "mci_clk"; > }; > -> spi1: spi at f8008000 { +> spi1: spi@f8008000 { > @@ -187,6 +212,8 @@ > dma-names = "tx", "rx"; > pinctrl-names = "default"; @@ -195,7 +195,7 @@ Bye, > + 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>; @@ -204,7 +204,7 @@ Bye, > + 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"; @@ -221,7 +221,7 @@ Bye, > + clocks = <&periph 6>; > }; > -> pioB: gpio at fffff400 { +> pioB: gpio@fffff400 { > @@ -636,6 +680,7 @@ > gpio-controller; > interrupt-controller; @@ -229,7 +229,7 @@ Bye, > + clocks = <&periph 7>; > }; > -> pioC: gpio at fffff600 { +> pioC: gpio@fffff600 { > @@ -646,6 +691,7 @@ > gpio-controller; > interrupt-controller; @@ -237,7 +237,7 @@ Bye, > + clocks = <&periph 8>; > }; > -> pioD: gpio at fffff800 { +> pioD: gpio@fffff800 { > @@ -656,6 +702,7 @@ > gpio-controller; > interrupt-controller; @@ -245,7 +245,7 @@ Bye, > + clocks = <&periph 9>; > }; > -> pioE: gpio at fffffa00 { +> pioE: gpio@fffffa00 { > @@ -666,12 +713,286 @@ > gpio-controller; > interrupt-controller; @@ -254,7 +254,7 @@ Bye, > }; > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > - compatible = "atmel,at91rm9200-pmc"; > + compatible = "atmel,sama5d3-pmc"; > reg = <0xfffffc00 0x120>; @@ -533,7 +533,7 @@ Bye, > + }; > }; > -> rstc at fffffe00 { +> rstc@fffffe00 { > @@ -683,6 +1004,7 @@ > compatible = "atmel,at91sam9260-pit"; > reg = <0xfffffe30 0xf>; @@ -541,7 +541,7 @@ Bye, > + clocks = <&mck>; > }; > -> watchdog at fffffe40 { +> watchdog@fffffe40 { > @@ -705,6 +1027,8 @@ > reg = <0x00500000 0x100000 > 0xf8030000 0x4000>; @@ -578,7 +578,7 @@ Bye, > > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + can0_clk { > + atmel,clk-id = <40>; @@ -592,7 +592,7 @@ Bye, > + }; > + }; > + -> can0: can at f000c000 { +> can0: can@f000c000 { > compatible = "atmel,at91sam9x5-can"; > reg = <0xf000c000 0x300>; > interrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>; @@ -620,7 +620,7 @@ Bye, > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + macb1_clk { > + atmel,clk-id = <35>; @@ -628,7 +628,7 @@ Bye, > + }; > + }; > + -> macb1: ethernet at f802c000 { +> macb1: ethernet@f802c000 { > compatible = "cdns,at32ap7000-macb", "cdns,macb"; > reg = <0xf802c000 0x100>; > interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>; @@ -647,7 +647,7 @@ Bye, > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + macb0_clk { > + atmel,clk-id = <34>; @@ -655,7 +655,7 @@ Bye, > + }; > + }; > + -> macb0: ethernet at f0028000 { +> macb0: ethernet@f0028000 { > compatible = "cdns,pc302-gem", "cdns,gem"; > reg = <0xf0028000 0x100>; > interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>; @@ -675,7 +675,7 @@ Bye, > }; > }; > + -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + lcdc_clk { > + atmel,clk-id = <36>; @@ -708,7 +708,7 @@ Bye, > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + mci2_clk { > + atmel,clk-id = <23>; @@ -716,7 +716,7 @@ Bye, > + }; > + }; > + -> mmc2: mmc at f8004000 { +> mmc2: mmc@f8004000 { > compatible = "atmel,hsmci"; > reg = <0xf8004000 0x600>; > @@ -38,6 +47,8 @@ @@ -744,7 +744,7 @@ Bye, > > ahb { > apb { -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + tcb1_clk { > + atmel,clk-id = <27>; @@ -753,7 +753,7 @@ Bye, > + }; > + }; > + -> tcb1: timer at f8014000 { +> tcb1: timer@f8014000 { > compatible = "atmel,at91sam9x5-tcb"; > reg = <0xf8014000 0x100>; > interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>; @@ -778,7 +778,7 @@ Bye, > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periph: periphck { > + uart0_clk { > + atmel,clk-id = <16>; @@ -792,7 +792,7 @@ Bye, > + }; > + }; > + -> 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/N1/content_digest index 9955c5f..a009870 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,20 @@ "ref\05260F959.2090705@atmel.com\0" "ref\01382132907-30198-1-git-send-email-b.brezillon@overkiz.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH v3 4/7] ARM: at91/dt: define sama5d3 clocks\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH v3 4/7] ARM: at91/dt: define sama5d3 clocks\0" "Date\0Mon, 4 Nov 2013 14:55:03 +0100\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<linux-arm-kernel@lists.infradead.org>" + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On 18/10/2013 23:48, Boris BREZILLON :\n" @@ -70,7 +81,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" @@ -97,7 +108,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" @@ -140,7 +151,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" @@ -203,7 +214,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" @@ -212,7 +223,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" @@ -229,7 +240,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" @@ -237,7 +248,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" @@ -245,7 +256,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" @@ -253,7 +264,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" @@ -262,7 +273,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" @@ -541,7 +552,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" @@ -549,7 +560,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" @@ -586,7 +597,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" @@ -600,7 +611,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" @@ -628,7 +639,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" @@ -636,7 +647,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" @@ -655,7 +666,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" @@ -663,7 +674,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" @@ -683,7 +694,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" @@ -716,7 +727,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" @@ -724,7 +735,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" @@ -752,7 +763,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" @@ -761,7 +772,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" @@ -786,7 +797,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" @@ -800,7 +811,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" @@ -826,4 +837,4 @@ "-- \n" Nicolas Ferre -c03b0c4519e365c685e4d2470aa4b06f508da152fe94d5b8252e9e94f2e4230a +a88492da506767d93e610323eacfbded4517314d8a4691ed4545bdc3029cf399
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.