diff for duplicates of <20140417145529.GN2813@piout.net> diff --git a/a/1.txt b/N1/1.txt index acc595b..ffdf25b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On 14/04/2014 at 10:43:12 +0200, Boris Brezillon wrote : > Define sam9x5 clocks in sam9x5 dt files 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/at91sam9x5.dtsi | 355 ++++++++++++++++++++++++++++++- > arch/arm/boot/dts/at91sam9x5_can.dtsi | 31 +++ @@ -56,7 +56,7 @@ On 14/04/2014 at 10:43:12 +0200, Boris Brezillon wrote : > @@ -77,8 +96,272 @@ > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > - compatible = "atmel,at91rm9200-pmc"; > + compatible = "atmel,at91sam9x5-pmc"; > reg = <0xfffffc00 0x100>; @@ -330,7 +330,7 @@ using a compatible string that doesn't exist at all here. > + }; > }; > -> rstc at fffffe00 { +> rstc@fffffe00 { > @@ -95,18 +378,47 @@ > compatible = "atmel,at91sam9260-pit"; > reg = <0xfffffe30 0xf>; @@ -338,7 +338,7 @@ using a compatible string that doesn't exist at all here. > + clocks = <&mck>; > + }; > + -> + sckc at fffffe50 { +> + sckc@fffffe50 { > + compatible = "atmel,at91sam9x5-sckc"; > + reg = <0xfffffe50 0x4>; > + @@ -362,7 +362,7 @@ using a compatible string that doesn't exist at all here. > + }; > }; > -> tcb0: timer at f8008000 { +> tcb0: timer@f8008000 { > compatible = "atmel,at91sam9x5-tcb"; > reg = <0xf8008000 0x100>; > interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>; @@ -370,7 +370,7 @@ using a compatible string that doesn't exist at all here. > + 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>; @@ -378,7 +378,7 @@ using a compatible string that doesn't exist at all here. > + clock-names = "t0_clk"; > }; > -> dma0: dma-controller at ffffec00 { +> dma0: dma-controller@ffffec00 { > @@ -114,6 +426,8 @@ > reg = <0xffffec00 0x200>; > interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; @@ -387,7 +387,7 @@ using a compatible string that doesn't exist at all here. > + clock-names = "dma_clk"; > }; > -> dma1: dma-controller at ffffee00 { +> dma1: dma-controller@ffffee00 { > @@ -121,6 +435,8 @@ > reg = <0xffffee00 0x200>; > interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>; @@ -396,7 +396,7 @@ using a compatible string that doesn't exist at all here. > + clock-names = "dma_clk"; > }; > -> pinctrl at fffff400 { +> pinctrl@fffff400 { > @@ -453,6 +769,7 @@ > gpio-controller; > interrupt-controller; @@ -404,7 +404,7 @@ using a compatible string that doesn't exist at all here. > + clocks = <&pioAB_clk>; > }; > -> pioB: gpio at fffff600 { +> pioB: gpio@fffff600 { > @@ -464,6 +781,7 @@ > #gpio-lines = <19>; > interrupt-controller; @@ -412,7 +412,7 @@ using a compatible string that doesn't exist at all here. > + clocks = <&pioAB_clk>; > }; > -> pioC: gpio at fffff800 { +> pioC: gpio@fffff800 { > @@ -474,6 +792,7 @@ > gpio-controller; > interrupt-controller; @@ -420,7 +420,7 @@ using a compatible string that doesn't exist at all here. > + clocks = <&pioCD_clk>; > }; > -> pioD: gpio at fffffa00 { +> pioD: gpio@fffffa00 { > @@ -485,6 +804,7 @@ > #gpio-lines = <22>; > interrupt-controller; @@ -591,7 +591,7 @@ using a compatible string that doesn't exist at all here. > + * at91sam9x5_macb0.dtsi - Device Tree Include file for AT91SAM9x5 SoC with 1 > + * Ethernet interface. > + * -> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> +> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org> > + * > + * Licensed under GPLv2. > + */ @@ -602,7 +602,7 @@ using a compatible string that doesn't exist at all here. > +/ { > + ahb { > + apb { -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + can0_clk: can0_clk { > + #clock-cells = <0>; @@ -628,7 +628,7 @@ using a compatible string that doesn't exist at all here. > + * at91sam9x5_isi.dtsi - Device Tree Include file for AT91SAM9x5 SoC with an > + * Image Sensor Interface. > + * -> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> +> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org> > + * > + * Licensed under GPLv2. > + */ @@ -639,7 +639,7 @@ using a compatible string that doesn't exist at all here. > +/ { > + ahb { > + apb { -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + isi_clk: isi_clk { > + #clock-cells = <0>; @@ -660,7 +660,7 @@ using a compatible string that doesn't exist at all here. > + * at91sam9x5_lcd.dtsi - Device Tree Include file for AT91SAM9x5 SoC with an > + * LCD controller. > + * -> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> +> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org> > + * > + * Licensed under GPLv2. > + */ @@ -671,7 +671,7 @@ using a compatible string that doesn't exist at all here. > +/ { > + ahb { > + apb { -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + lcdc_clk: lcdc_clk { > + #clock-cells = <0>; @@ -690,7 +690,7 @@ using a compatible string that doesn't exist at all here. > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + macb0_clk: macb0_clk { > + #clock-cells = <0>; @@ -699,7 +699,7 @@ using a compatible string that doesn't exist at all here. > + }; > + }; > + -> macb0: ethernet at f802c000 { +> macb0: ethernet@f802c000 { > compatible = "cdns,at32ap7000-macb", "cdns,macb"; > reg = <0xf802c000 0x100>; > interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; @@ -718,7 +718,7 @@ using a compatible string that doesn't exist at all here. > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + macb1_clk: macb1_clk { > + #clock-cells = <0>; @@ -727,7 +727,7 @@ using a compatible string that doesn't exist at all here. > + }; > + }; > + -> macb1: ethernet at f8030000 { +> macb1: ethernet@f8030000 { > compatible = "cdns,at32ap7000-macb", "cdns,macb"; > reg = <0xf8030000 0x100>; > interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; @@ -746,7 +746,7 @@ using a compatible string that doesn't exist at all here. > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + usart3_clk: usart3_clk { > + #clock-cells = <0>; @@ -755,7 +755,7 @@ using a compatible string that doesn't exist at all here. > + }; > + }; > + -> usart3: serial at f8028000 { +> usart3: serial@f8028000 { > compatible = "atmel,at91sam9260-usart"; > reg = <0xf8028000 0x200>; > interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>; @@ -774,3 +774,7 @@ using a compatible string that doesn't exist at all here. 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 36bcd51..5f7335c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,22 @@ "ref\01397464994-27267-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01397464994-27267-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 sam9x5 clocks\0" + "ref\01397464994-27267-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 sam9x5 clocks\0" "Date\0Thu, 17 Apr 2014 16:55:29 +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> + 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:43:12 +0200, Boris Brezillon wrote :\n" "> Define sam9x5 clocks in sam9x5 dt files and make use of them in peripheral\n" "> 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/at91sam9x5.dtsi | 355 ++++++++++++++++++++++++++++++-\n" "> arch/arm/boot/dts/at91sam9x5_can.dtsi | 31 +++\n" @@ -64,7 +70,7 @@ "> @@ -77,8 +96,272 @@\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,at91sam9x5-pmc\";\n" "> \t\t\t\treg = <0xfffffc00 0x100>;\n" @@ -338,7 +344,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\trstc at fffffe00 {\n" + "> \t\t\trstc@fffffe00 {\n" "> @@ -95,18 +378,47 @@\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-pit\";\n" "> \t\t\t\treg = <0xfffffe30 0xf>;\n" @@ -346,7 +352,7 @@ "> +\t\t\t\tclocks = <&mck>;\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" @@ -370,7 +376,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\ttcb0: timer at f8008000 {\n" + "> \t\t\ttcb0: timer@f8008000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-tcb\";\n" "> \t\t\t\treg = <0xf8008000 0x100>;\n" "> \t\t\t\tinterrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -378,7 +384,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" @@ -386,7 +392,7 @@ "> +\t\t\t\tclock-names = \"t0_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tdma0: dma-controller at ffffec00 {\n" + "> \t\t\tdma0: dma-controller@ffffec00 {\n" "> @@ -114,6 +426,8 @@\n" "> \t\t\t\treg = <0xffffec00 0x200>;\n" "> \t\t\t\tinterrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -395,7 +401,7 @@ "> +\t\t\t\tclock-names = \"dma_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tdma1: dma-controller at ffffee00 {\n" + "> \t\t\tdma1: dma-controller@ffffee00 {\n" "> @@ -121,6 +435,8 @@\n" "> \t\t\t\treg = <0xffffee00 0x200>;\n" "> \t\t\t\tinterrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -404,7 +410,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" "> @@ -453,6 +769,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -412,7 +418,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" "> @@ -464,6 +781,7 @@\n" "> \t\t\t\t\t#gpio-lines = <19>;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -420,7 +426,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" "> @@ -474,6 +792,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -428,7 +434,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" "> @@ -485,6 +804,7 @@\n" "> \t\t\t\t\t#gpio-lines = <22>;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -599,7 +605,7 @@ "> + * at91sam9x5_macb0.dtsi - Device Tree Include file for AT91SAM9x5 SoC with 1\n" "> + * Ethernet interface.\n" "> + *\n" - "> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>\n" + "> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>\n" "> + *\n" "> + * Licensed under GPLv2.\n" "> + */\n" @@ -610,7 +616,7 @@ "> +/ {\n" "> +\tahb {\n" "> +\t\tapb {\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiphck {\n" "> +\t\t\t\t\tcan0_clk: can0_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -636,7 +642,7 @@ "> + * at91sam9x5_isi.dtsi - Device Tree Include file for AT91SAM9x5 SoC with an\n" "> + * Image Sensor Interface.\n" "> + *\n" - "> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>\n" + "> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>\n" "> + *\n" "> + * Licensed under GPLv2.\n" "> + */\n" @@ -647,7 +653,7 @@ "> +/ {\n" "> +\tahb {\n" "> +\t\tapb {\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiphck {\n" "> +\t\t\t\t\tisi_clk: isi_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -668,7 +674,7 @@ "> + * at91sam9x5_lcd.dtsi - Device Tree Include file for AT91SAM9x5 SoC with an\n" "> + * LCD controller.\n" "> + *\n" - "> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>\n" + "> + * Copyright (C) 2013 Boris BREZILLON <b.brezillon-ZNYIgs0QAGpBDgjK7y7TUQ@public.gmane.org>\n" "> + *\n" "> + * Licensed under GPLv2.\n" "> + */\n" @@ -679,7 +685,7 @@ "> +/ {\n" "> +\tahb {\n" "> +\t\tapb {\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiphck {\n" "> +\t\t\t\t\tlcdc_clk: lcdc_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -698,7 +704,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\tperiphck {\n" "> +\t\t\t\t\tmacb0_clk: macb0_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -707,7 +713,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmacb0: ethernet at f802c000 {\n" + "> \t\t\tmacb0: ethernet@f802c000 {\n" "> \t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> \t\t\t\treg = <0xf802c000 0x100>;\n" "> \t\t\t\tinterrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -726,7 +732,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\tperiphck {\n" "> +\t\t\t\t\tmacb1_clk: macb1_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -735,7 +741,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmacb1: ethernet at f8030000 {\n" + "> \t\t\tmacb1: ethernet@f8030000 {\n" "> \t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> \t\t\t\treg = <0xf8030000 0x100>;\n" "> \t\t\t\tinterrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -754,7 +760,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\tperiphck {\n" "> +\t\t\t\t\tusart3_clk: usart3_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -763,7 +769,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tusart3: serial at f8028000 {\n" + "> \t\t\tusart3: serial@f8028000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> \t\t\t\treg = <0xf8028000 0x200>;\n" "> \t\t\t\tinterrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;\n" @@ -781,6 +787,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 -b8e98f413e237c2a3f8cc39c7a34ad1f552d748fdfa0b71699db8f0196e75dfe +f411c6f0a22c73e5274b7310788254c7e0666e10a5f1d749607b5acc538253c4
diff --git a/a/1.txt b/N2/1.txt index acc595b..23a9314 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -56,7 +56,7 @@ On 14/04/2014 at 10:43:12 +0200, Boris Brezillon wrote : > @@ -77,8 +96,272 @@ > }; > -> pmc: pmc at fffffc00 { +> pmc: pmc@fffffc00 { > - compatible = "atmel,at91rm9200-pmc"; > + compatible = "atmel,at91sam9x5-pmc"; > reg = <0xfffffc00 0x100>; @@ -330,7 +330,7 @@ using a compatible string that doesn't exist at all here. > + }; > }; > -> rstc at fffffe00 { +> rstc@fffffe00 { > @@ -95,18 +378,47 @@ > compatible = "atmel,at91sam9260-pit"; > reg = <0xfffffe30 0xf>; @@ -338,7 +338,7 @@ using a compatible string that doesn't exist at all here. > + clocks = <&mck>; > + }; > + -> + sckc at fffffe50 { +> + sckc@fffffe50 { > + compatible = "atmel,at91sam9x5-sckc"; > + reg = <0xfffffe50 0x4>; > + @@ -362,7 +362,7 @@ using a compatible string that doesn't exist at all here. > + }; > }; > -> tcb0: timer at f8008000 { +> tcb0: timer@f8008000 { > compatible = "atmel,at91sam9x5-tcb"; > reg = <0xf8008000 0x100>; > interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>; @@ -370,7 +370,7 @@ using a compatible string that doesn't exist at all here. > + 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>; @@ -378,7 +378,7 @@ using a compatible string that doesn't exist at all here. > + clock-names = "t0_clk"; > }; > -> dma0: dma-controller at ffffec00 { +> dma0: dma-controller@ffffec00 { > @@ -114,6 +426,8 @@ > reg = <0xffffec00 0x200>; > interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; @@ -387,7 +387,7 @@ using a compatible string that doesn't exist at all here. > + clock-names = "dma_clk"; > }; > -> dma1: dma-controller at ffffee00 { +> dma1: dma-controller@ffffee00 { > @@ -121,6 +435,8 @@ > reg = <0xffffee00 0x200>; > interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>; @@ -396,7 +396,7 @@ using a compatible string that doesn't exist at all here. > + clock-names = "dma_clk"; > }; > -> pinctrl at fffff400 { +> pinctrl@fffff400 { > @@ -453,6 +769,7 @@ > gpio-controller; > interrupt-controller; @@ -404,7 +404,7 @@ using a compatible string that doesn't exist at all here. > + clocks = <&pioAB_clk>; > }; > -> pioB: gpio at fffff600 { +> pioB: gpio@fffff600 { > @@ -464,6 +781,7 @@ > #gpio-lines = <19>; > interrupt-controller; @@ -412,7 +412,7 @@ using a compatible string that doesn't exist at all here. > + clocks = <&pioAB_clk>; > }; > -> pioC: gpio at fffff800 { +> pioC: gpio@fffff800 { > @@ -474,6 +792,7 @@ > gpio-controller; > interrupt-controller; @@ -420,7 +420,7 @@ using a compatible string that doesn't exist at all here. > + clocks = <&pioCD_clk>; > }; > -> pioD: gpio at fffffa00 { +> pioD: gpio@fffffa00 { > @@ -485,6 +804,7 @@ > #gpio-lines = <22>; > interrupt-controller; @@ -602,7 +602,7 @@ using a compatible string that doesn't exist at all here. > +/ { > + ahb { > + apb { -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + can0_clk: can0_clk { > + #clock-cells = <0>; @@ -639,7 +639,7 @@ using a compatible string that doesn't exist at all here. > +/ { > + ahb { > + apb { -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + isi_clk: isi_clk { > + #clock-cells = <0>; @@ -671,7 +671,7 @@ using a compatible string that doesn't exist at all here. > +/ { > + ahb { > + apb { -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + lcdc_clk: lcdc_clk { > + #clock-cells = <0>; @@ -690,7 +690,7 @@ using a compatible string that doesn't exist at all here. > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + macb0_clk: macb0_clk { > + #clock-cells = <0>; @@ -699,7 +699,7 @@ using a compatible string that doesn't exist at all here. > + }; > + }; > + -> macb0: ethernet at f802c000 { +> macb0: ethernet@f802c000 { > compatible = "cdns,at32ap7000-macb", "cdns,macb"; > reg = <0xf802c000 0x100>; > interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; @@ -718,7 +718,7 @@ using a compatible string that doesn't exist at all here. > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + macb1_clk: macb1_clk { > + #clock-cells = <0>; @@ -727,7 +727,7 @@ using a compatible string that doesn't exist at all here. > + }; > + }; > + -> macb1: ethernet at f8030000 { +> macb1: ethernet@f8030000 { > compatible = "cdns,at32ap7000-macb", "cdns,macb"; > reg = <0xf8030000 0x100>; > interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; @@ -746,7 +746,7 @@ using a compatible string that doesn't exist at all here. > }; > }; > -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + periphck { > + usart3_clk: usart3_clk { > + #clock-cells = <0>; @@ -755,7 +755,7 @@ using a compatible string that doesn't exist at all here. > + }; > + }; > + -> usart3: serial at f8028000 { +> usart3: serial@f8028000 { > compatible = "atmel,at91sam9260-usart"; > reg = <0xf8028000 0x200>; > interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>; diff --git a/a/content_digest b/N2/content_digest index 36bcd51..b0cdcb9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,14 @@ "ref\01397464994-27267-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01397464994-27267-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 sam9x5 clocks\0" + "From\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" + "Subject\0Re: [PATCH 2/4] ARM: at91/dt: define sam9x5 clocks\0" "Date\0Thu, 17 Apr 2014 16:55:29 +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> + 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:43:12 +0200, Boris Brezillon wrote :\n" @@ -64,7 +69,7 @@ "> @@ -77,8 +96,272 @@\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,at91sam9x5-pmc\";\n" "> \t\t\t\treg = <0xfffffc00 0x100>;\n" @@ -338,7 +343,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\trstc at fffffe00 {\n" + "> \t\t\trstc@fffffe00 {\n" "> @@ -95,18 +378,47 @@\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-pit\";\n" "> \t\t\t\treg = <0xfffffe30 0xf>;\n" @@ -346,7 +351,7 @@ "> +\t\t\t\tclocks = <&mck>;\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" @@ -370,7 +375,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\ttcb0: timer at f8008000 {\n" + "> \t\t\ttcb0: timer@f8008000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-tcb\";\n" "> \t\t\t\treg = <0xf8008000 0x100>;\n" "> \t\t\t\tinterrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -378,7 +383,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" @@ -386,7 +391,7 @@ "> +\t\t\t\tclock-names = \"t0_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tdma0: dma-controller at ffffec00 {\n" + "> \t\t\tdma0: dma-controller@ffffec00 {\n" "> @@ -114,6 +426,8 @@\n" "> \t\t\t\treg = <0xffffec00 0x200>;\n" "> \t\t\t\tinterrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -395,7 +400,7 @@ "> +\t\t\t\tclock-names = \"dma_clk\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tdma1: dma-controller at ffffee00 {\n" + "> \t\t\tdma1: dma-controller@ffffee00 {\n" "> @@ -121,6 +435,8 @@\n" "> \t\t\t\treg = <0xffffee00 0x200>;\n" "> \t\t\t\tinterrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -404,7 +409,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" "> @@ -453,6 +769,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -412,7 +417,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" "> @@ -464,6 +781,7 @@\n" "> \t\t\t\t\t#gpio-lines = <19>;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -420,7 +425,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" "> @@ -474,6 +792,7 @@\n" "> \t\t\t\t\tgpio-controller;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -428,7 +433,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" "> @@ -485,6 +804,7 @@\n" "> \t\t\t\t\t#gpio-lines = <22>;\n" "> \t\t\t\t\tinterrupt-controller;\n" @@ -610,7 +615,7 @@ "> +/ {\n" "> +\tahb {\n" "> +\t\tapb {\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiphck {\n" "> +\t\t\t\t\tcan0_clk: can0_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -647,7 +652,7 @@ "> +/ {\n" "> +\tahb {\n" "> +\t\tapb {\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiphck {\n" "> +\t\t\t\t\tisi_clk: isi_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -679,7 +684,7 @@ "> +/ {\n" "> +\tahb {\n" "> +\t\tapb {\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tperiphck {\n" "> +\t\t\t\t\tlcdc_clk: lcdc_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -698,7 +703,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\tperiphck {\n" "> +\t\t\t\t\tmacb0_clk: macb0_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -707,7 +712,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmacb0: ethernet at f802c000 {\n" + "> \t\t\tmacb0: ethernet@f802c000 {\n" "> \t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> \t\t\t\treg = <0xf802c000 0x100>;\n" "> \t\t\t\tinterrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -726,7 +731,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\tperiphck {\n" "> +\t\t\t\t\tmacb1_clk: macb1_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -735,7 +740,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tmacb1: ethernet at f8030000 {\n" + "> \t\t\tmacb1: ethernet@f8030000 {\n" "> \t\t\t\tcompatible = \"cdns,at32ap7000-macb\", \"cdns,macb\";\n" "> \t\t\t\treg = <0xf8030000 0x100>;\n" "> \t\t\t\tinterrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -754,7 +759,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\tperiphck {\n" "> +\t\t\t\t\tusart3_clk: usart3_clk {\n" "> +\t\t\t\t\t\t#clock-cells = <0>;\n" @@ -763,7 +768,7 @@ "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tusart3: serial at f8028000 {\n" + "> \t\t\tusart3: serial@f8028000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> \t\t\t\treg = <0xf8028000 0x200>;\n" "> \t\t\t\tinterrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;\n" @@ -783,4 +788,4 @@ "Embedded Linux, Kernel and Android engineering\n" http://free-electrons.com -b8e98f413e237c2a3f8cc39c7a34ad1f552d748fdfa0b71699db8f0196e75dfe +65a240240229dd8430188fb3b201acfdc7d49f70387ba6187755d117bc85275d
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.