diff for duplicates of <534BA52B.3040906@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index cfdf878..7ccdccc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -58,7 +58,7 @@ Boris >> @@ -75,8 +90,280 @@ >> }; >> ->> pmc: pmc at fffffc00 { +>> pmc: pmc@fffffc00 { >> - compatible = "atmel,at91rm9200-pmc"; >> - reg = <0xfffffc00 0x100>; >> + compatible = "atmel,at91sam9n12-pmc"; @@ -337,7 +337,7 @@ Boris >> + }; >> }; >> ->> rstc at fffffe00 { +>> rstc@fffffe00 { >> @@ -88,6 +375,7 @@ >> compatible = "atmel,at91sam9260-pit"; >> reg = <0xfffffe30 0xf>; @@ -345,12 +345,12 @@ Boris >> + 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>; >> + @@ -374,7 +374,7 @@ Boris >> + }; >> + }; >> + ->> mmc0: mmc at f0008000 { +>> mmc0: mmc@f0008000 { >> compatible = "atmel,hsmci"; >> reg = <0xf0008000 0x600>; >> interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>; @@ -393,7 +393,7 @@ Boris >> + 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>; @@ -401,7 +401,7 @@ Boris >> + 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>; @@ -410,7 +410,7 @@ Boris >> + clock-names = "dma_clk"; >> }; >> ->> pinctrl at fffff400 { +>> pinctrl@fffff400 { >> @@ -392,6 +712,7 @@ >> gpio-controller; >> interrupt-controller; @@ -418,7 +418,7 @@ Boris >> + clocks = <&pioAB_clk>; >> }; >> ->> pioB: gpio at fffff600 { +>> pioB: gpio@fffff600 { >> @@ -402,6 +723,7 @@ >> gpio-controller; >> interrupt-controller; @@ -426,7 +426,7 @@ Boris >> + clocks = <&pioAB_clk>; >> }; >> ->> pioC: gpio at fffff800 { +>> pioC: gpio@fffff800 { >> @@ -412,6 +734,7 @@ >> gpio-controller; >> interrupt-controller; @@ -434,7 +434,7 @@ Boris >> + 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/N1/content_digest index a2db662..17fb192 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,16 @@ "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" "ref\020140414085643.GK2967@piout.net\0" - "From\0boris.brezillon@free-electrons.com (Boris BREZILLON)\0" - "Subject\0[PATCH 2/4] ARM: at91/dt: define sam9n12 clocks\0" + "From\0Boris BREZILLON <boris.brezillon@free-electrons.com>\0" + "Subject\0Re: [PATCH 2/4] ARM: at91/dt: define sam9n12 clocks\0" "Date\0Mon, 14 Apr 2014 11:06:51 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Alexandre Belloni <alexandre.belloni@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" "Hi Alexandre,\n" @@ -67,7 +73,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" @@ -346,7 +352,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" @@ -354,12 +360,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" @@ -383,7 +389,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" @@ -402,7 +408,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" @@ -410,7 +416,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" @@ -419,7 +425,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" @@ -427,7 +433,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" @@ -435,7 +441,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" @@ -443,7 +449,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" @@ -567,4 +573,4 @@ "Embedded Linux and Kernel engineering\n" http://free-electrons.com -11ef979a2a410214e6cb63aad85e75f38d98bb9584458666541abfe32fe4f1df +b5ab812113ef81c7cff4969c3683a0b1018a74d0b553f58f76ada96949a1c1a5
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.