diff for duplicates of <20110926182934.GA9194@gallagher> diff --git a/a/1.txt b/N1/1.txt index ee07d31..ef096d5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ On Mon, Sep 26, 2011 at 01:04:19PM -0500, Rob Herring wrote: > > v2: - change timer compatible strings to be more soc specific > > - split vic node into 2 devices > > -> > Signed-off-by: Jamie Iles <jamie@jamieiles.com> +> > Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org> > > --- > > arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 249 ++++++++++++++++++++++ > > arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 365 ++++++++++++++++++++++++++++++++ @@ -52,7 +52,7 @@ On Mon, Sep 26, 2011 at 01:04:19PM -0500, Rob Herring wrote: > > + #address-cells = <1>; > > + #size-cells = <0>; > > + -> > + cpu at 0 { +> > + cpu@0 { > > + compatible = "arm,1176jz-s"; > > + clock-frequency = <400000000>; > > + reg = <0>; @@ -74,7 +74,7 @@ OK, that's fine with me. > > + #size-cells = <1>; > > + ranges; > > + -> > + pclk: clock at 0 { +> > + pclk: clock@0 { > > + compatible = "fixed-clock"; > > + clock-outputs = "bus", "pclk"; > > + clock-frequency = <200000000>; @@ -88,11 +88,11 @@ OK, that's fine with me. > > + #size-cells = <1>; > > + ranges = <0 0x80000000 0x400000>; > > + -> > + emac: gem at 30000 { +> > + emac: gem@30000 { > > ethernet is the preferred generic name here. See section 2.2.2 of ePAPR. > -> So it would be "emac: ethernet at 30000" +> So it would be "emac: ethernet@30000" I'll take a closer look at that document, I don't think I've spent much time with it. @@ -102,19 +102,19 @@ time with it. > > + interrupts = <31>; > > + }; > > + -> > + dmac1: dmac at 40000 { +> > + dmac1: dmac@40000 { > > + compatible = "snps,dw-dmac"; > > + reg = <0x40000 0x10000>; > > + interrupts = <25>; > > + }; > > + -> > + dmac2: dmac at 50000 { +> > + dmac2: dmac@50000 { > > + compatible = "snps,dw-dmac"; > > + reg = <0x50000 0x10000>; > > + interrupts = <26>; > > + }; > > + -> > + vic0: interrupt-controller at 60000 { +> > + vic0: interrupt-controller@60000 { > > + compatible = "arm,pl192-vic"; > > + interrupt-controller; > > + reg = <0x60000 0x1000>; @@ -128,26 +128,26 @@ driver yet I thought I'd hold off from doing a separate binding. > > + }; > > + -> > + vic1: interrupt-controller at 64000 { +> > + vic1: interrupt-controller@64000 { > > + compatible = "arm,pl192-vic"; > > + interrupt-controller; > > + reg = <0x64000 0x1000>; > > + #interrupt-cells = <1>; > > + }; > > + -> > + fuse: picoxcell-fuse at 80000 { +> > + fuse: picoxcell-fuse@80000 { > > + compatible = "picoxcell,fuse-pc3x2"; > > + reg = <0x80000 0x10000>; > > + }; > > + -> > + ssi: picoxcell-spi at 90000 { +> > + ssi: picoxcell-spi@90000 { > > + compatible = "picoxcell,spi"; > > + reg = <0x90000 0x10000>; > > + interrupt-parent = <&vic0>; > > + interrupts = <10>; > > + }; > > + -> > + ipsec: spacc at 100000 { +> > + ipsec: spacc@100000 { > > + compatible = "picochip,spacc-ipsec"; > > + reg = <0x100000 0x10000>; > > + interrupt-parent = <&vic0>; @@ -155,14 +155,14 @@ driver yet I thought I'd hold off from doing a separate binding. > > + ref-clock = <&pclk>, "ref"; > > + }; > > + -> > + srtp: spacc at 140000 { +> > + srtp: spacc@140000 { > > + compatible = "picochip,spacc-srtp"; > > + reg = <0x140000 0x10000>; > > + interrupt-parent = <&vic0>; > > + interrupts = <23>; > > + }; > > + -> > + l2_engine: spacc at 180000 { +> > + l2_engine: spacc@180000 { > > + compatible = "picochip,spacc-l2"; > > + reg = <0x180000 0x10000>; > > + interrupt-parent = <&vic0>; @@ -176,7 +176,7 @@ driver yet I thought I'd hold off from doing a separate binding. > > + #size-cells = <1>; > > + ranges = <0 0x200000 0x80000>; > > + -> > + rtc0: rtc at 00000 { +> > + rtc0: rtc@00000 { > > + compatible = "picochip,pc3x2-rtc"; > > + clock-freq = <200000000>; > > + reg = <0x00000 0xf>; @@ -184,7 +184,7 @@ driver yet I thought I'd hold off from doing a separate binding. > > + interrupts = <8>; > > + }; > > + -> > + timer0: timer at 10000 { +> > + timer0: timer@10000 { > > + compatible = "picochip,pc3x2-timer"; > > + interrupt-parent = <&vic0>; > > + interrupts = <4>; @@ -192,7 +192,7 @@ driver yet I thought I'd hold off from doing a separate binding. > > + reg = <0x10000 0x14>; > > + }; > > + -> > + timer1: timer at 10014 { +> > + timer1: timer@10014 { > > + compatible = "picochip,pc3x2-timer"; > > + interrupt-parent = <&vic0>; > > + interrupts = <5>; @@ -200,7 +200,7 @@ driver yet I thought I'd hold off from doing a separate binding. > > + reg = <0x10014 0x14>; > > + }; > > + -> > + timer2: timer at 10028 { +> > + timer2: timer@10028 { > > + compatible = "picochip,pc3x2-timer"; > > + interrupt-parent = <&vic0>; > > + interrupts = <6>; @@ -208,7 +208,7 @@ driver yet I thought I'd hold off from doing a separate binding. > > + reg = <0x10028 0x14>; > > + }; > > + -> > + timer3: timer at 1003c { +> > + timer3: timer@1003c { > > + compatible = "picochip,pc3x2-timer"; > > + interrupt-parent = <&vic0>; > > + interrupts = <7>; @@ -216,14 +216,14 @@ driver yet I thought I'd hold off from doing a separate binding. > > + reg = <0x1003c 0x14>; > > + }; > > + -> > + gpio: gpio at 20000 { +> > + gpio: gpio@20000 { > > + compatible = "snps,dw-apb-gpio"; > > + reg = <0x20000 0x1000>; > > + #address-cells = <1>; > > + #size-cells = <0>; > > + reg-io-width = <4>; > > + -> > + banka: gpio-controller at 0 { +> > + banka: gpio-controller@0 { > > + compatible = "snps,dw-apb-gpio-bank"; > > + gpio-controller; > > + #gpio-cells = <2>; @@ -241,7 +241,7 @@ though. > > + regoffset-dirout = <0x04>; > > + }; > > + -> > + bankb: gpio-controller at 1 { +> > + bankb: gpio-controller@1 { > > + compatible = "snps,dw-apb-gpio-bank"; > > + gpio-controller; > > + #gpio-cells = <2>; @@ -253,9 +253,9 @@ though. > > + }; > > + }; > > + -> > + uart0: uart at 30000 { +> > + uart0: uart@30000 { > -> Preferred name is serial at 30000 +> Preferred name is serial@30000 OK. @@ -268,7 +268,7 @@ OK. > > + reg-io-width = <4>; > > + }; > > + -> > + uart1: uart at 40000 { +> > + uart1: uart@40000 { > > + compatible = "snps,dw-apb-uart"; > > + reg = <0x40000 0x1000>; > > + interrupt-parent = <&vic1>; @@ -278,7 +278,7 @@ OK. > > + reg-io-width = <4>; > > + }; > > + -> > + wdog: watchdog at 50000 { +> > + wdog: watchdog@50000 { > > + compatible = "snps,dw-apb-wdg"; > > + reg = <0x50000 0x10000>; > > + interrupt-parent = <&vic0>; @@ -294,7 +294,7 @@ OK. > > + compatible = "simple-bus"; > > + ranges; > > + -> > + ebi at 50000000 { +> > + ebi@50000000 { > > + compatible = "simple-bus"; > > + #address-cells = <2>; > > + #size-cells = <1>; @@ -304,7 +304,7 @@ OK. > > + 3 0 0x58000000 0x08000000>; > > + }; > > + -> > + axi2pico at c0000000 { +> > + axi2pico@c0000000 { > > + compatible = "picochip,axi2pico-pc3x2"; > > + reg = <0xc0000000 0x10000>; > > + interrupts = <13 14 15 16 17 18 19 20 21>; diff --git a/a/content_digest b/N1/content_digest index 487cfbb..7d4e41e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,13 @@ "ref\01317050689-16417-1-git-send-email-jamie@jamieiles.com\0" "ref\01317050689-16417-3-git-send-email-jamie@jamieiles.com\0" "ref\04E80BEA3.1030803@gmail.com\0" - "From\0jamie@jamieiles.com (Jamie Iles)\0" - "Subject\0[PATCHv3 2/4] picoxcell: add the DTS for pc3x2 and pc3x3 devices\0" + "ref\04E80BEA3.1030803-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>\0" + "Subject\0Re: [PATCHv3 2/4] picoxcell: add the DTS for pc3x2 and pc3x3 devices\0" "Date\0Mon, 26 Sep 2011 19:29:35 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Cc\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "Hi Rob,\n" @@ -24,7 +27,7 @@ "> > v2:\t- change timer compatible strings to be more soc specific\n" "> > \t- split vic node into 2 devices\n" "> > \n" - "> > Signed-off-by: Jamie Iles <jamie@jamieiles.com>\n" + "> > Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>\n" "> > ---\n" "> > arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 249 ++++++++++++++++++++++\n" "> > arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 365 ++++++++++++++++++++++++++++++++\n" @@ -61,7 +64,7 @@ "> > +\t\t#address-cells = <1>;\n" "> > +\t\t#size-cells = <0>;\n" "> > +\n" - "> > +\t\tcpu at 0 {\n" + "> > +\t\tcpu@0 {\n" "> > +\t\t\tcompatible = \"arm,1176jz-s\";\n" "> > +\t\t\tclock-frequency = <400000000>;\n" "> > +\t\t\treg = <0>;\n" @@ -83,7 +86,7 @@ "> > +\t\t#size-cells = <1>;\n" "> > +\t\tranges;\n" "> > +\n" - "> > +\t\tpclk: clock at 0 {\n" + "> > +\t\tpclk: clock@0 {\n" "> > +\t\t\tcompatible = \"fixed-clock\";\n" "> > +\t\t\tclock-outputs = \"bus\", \"pclk\";\n" "> > +\t\t\tclock-frequency = <200000000>;\n" @@ -97,11 +100,11 @@ "> > +\t\t#size-cells = <1>;\n" "> > +\t\tranges = <0 0x80000000 0x400000>;\n" "> > +\n" - "> > +\t\temac: gem at 30000 {\n" + "> > +\t\temac: gem@30000 {\n" "> \n" "> ethernet is the preferred generic name here. See section 2.2.2 of ePAPR.\n" "> \n" - "> So it would be \"emac: ethernet at 30000\"\n" + "> So it would be \"emac: ethernet@30000\"\n" "\n" "I'll take a closer look at that document, I don't think I've spent much \n" "time with it.\n" @@ -111,19 +114,19 @@ "> > +\t\t\tinterrupts = <31>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tdmac1: dmac at 40000 {\n" + "> > +\t\tdmac1: dmac@40000 {\n" "> > +\t\t\tcompatible = \"snps,dw-dmac\";\n" "> > +\t\t\treg = <0x40000 0x10000>;\n" "> > +\t\t\tinterrupts = <25>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tdmac2: dmac at 50000 {\n" + "> > +\t\tdmac2: dmac@50000 {\n" "> > +\t\t\tcompatible = \"snps,dw-dmac\";\n" "> > +\t\t\treg = <0x50000 0x10000>;\n" "> > +\t\t\tinterrupts = <26>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tvic0: interrupt-controller at 60000 {\n" + "> > +\t\tvic0: interrupt-controller@60000 {\n" "> > +\t\t\tcompatible = \"arm,pl192-vic\";\n" "> > +\t\t\tinterrupt-controller;\n" "> > +\t\t\treg = <0x60000 0x1000>;\n" @@ -137,26 +140,26 @@ "\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tvic1: interrupt-controller at 64000 {\n" + "> > +\t\tvic1: interrupt-controller@64000 {\n" "> > +\t\t\tcompatible = \"arm,pl192-vic\";\n" "> > +\t\t\tinterrupt-controller;\n" "> > +\t\t\treg = <0x64000 0x1000>;\n" "> > +\t\t\t#interrupt-cells = <1>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tfuse: picoxcell-fuse at 80000 {\n" + "> > +\t\tfuse: picoxcell-fuse@80000 {\n" "> > +\t\t\tcompatible = \"picoxcell,fuse-pc3x2\";\n" "> > +\t\t\treg = <0x80000 0x10000>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tssi: picoxcell-spi at 90000 {\n" + "> > +\t\tssi: picoxcell-spi@90000 {\n" "> > +\t\t\tcompatible = \"picoxcell,spi\";\n" "> > +\t\t\treg = <0x90000 0x10000>;\n" "> > +\t\t\tinterrupt-parent = <&vic0>;\n" "> > +\t\t\tinterrupts = <10>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tipsec: spacc at 100000 {\n" + "> > +\t\tipsec: spacc@100000 {\n" "> > +\t\t\tcompatible = \"picochip,spacc-ipsec\";\n" "> > +\t\t\treg = <0x100000 0x10000>;\n" "> > +\t\t\tinterrupt-parent = <&vic0>;\n" @@ -164,14 +167,14 @@ "> > +\t\t\tref-clock = <&pclk>, \"ref\";\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tsrtp: spacc at 140000 {\n" + "> > +\t\tsrtp: spacc@140000 {\n" "> > +\t\t\tcompatible = \"picochip,spacc-srtp\";\n" "> > +\t\t\treg = <0x140000 0x10000>;\n" "> > +\t\t\tinterrupt-parent = <&vic0>;\n" "> > +\t\t\tinterrupts = <23>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tl2_engine: spacc at 180000 {\n" + "> > +\t\tl2_engine: spacc@180000 {\n" "> > +\t\t\tcompatible = \"picochip,spacc-l2\";\n" "> > +\t\t\treg = <0x180000 0x10000>;\n" "> > +\t\t\tinterrupt-parent = <&vic0>;\n" @@ -185,7 +188,7 @@ "> > +\t\t\t#size-cells = <1>;\n" "> > +\t\t\tranges = <0 0x200000 0x80000>;\n" "> > +\n" - "> > +\t\t\trtc0: rtc at 00000 {\n" + "> > +\t\t\trtc0: rtc@00000 {\n" "> > +\t\t\t\tcompatible = \"picochip,pc3x2-rtc\";\n" "> > +\t\t\t\tclock-freq = <200000000>;\n" "> > +\t\t\t\treg = <0x00000 0xf>;\n" @@ -193,7 +196,7 @@ "> > +\t\t\t\tinterrupts = <8>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\ttimer0: timer at 10000 {\n" + "> > +\t\t\ttimer0: timer@10000 {\n" "> > +\t\t\t\tcompatible = \"picochip,pc3x2-timer\";\n" "> > +\t\t\t\tinterrupt-parent = <&vic0>;\n" "> > +\t\t\t\tinterrupts = <4>;\n" @@ -201,7 +204,7 @@ "> > +\t\t\t\treg = <0x10000 0x14>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\ttimer1: timer at 10014 {\n" + "> > +\t\t\ttimer1: timer@10014 {\n" "> > +\t\t\t\tcompatible = \"picochip,pc3x2-timer\";\n" "> > +\t\t\t\tinterrupt-parent = <&vic0>;\n" "> > +\t\t\t\tinterrupts = <5>;\n" @@ -209,7 +212,7 @@ "> > +\t\t\t\treg = <0x10014 0x14>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\ttimer2: timer at 10028 {\n" + "> > +\t\t\ttimer2: timer@10028 {\n" "> > +\t\t\t\tcompatible = \"picochip,pc3x2-timer\";\n" "> > +\t\t\t\tinterrupt-parent = <&vic0>;\n" "> > +\t\t\t\tinterrupts = <6>;\n" @@ -217,7 +220,7 @@ "> > +\t\t\t\treg = <0x10028 0x14>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\ttimer3: timer at 1003c {\n" + "> > +\t\t\ttimer3: timer@1003c {\n" "> > +\t\t\t\tcompatible = \"picochip,pc3x2-timer\";\n" "> > +\t\t\t\tinterrupt-parent = <&vic0>;\n" "> > +\t\t\t\tinterrupts = <7>;\n" @@ -225,14 +228,14 @@ "> > +\t\t\t\treg = <0x1003c 0x14>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\tgpio: gpio at 20000 {\n" + "> > +\t\t\tgpio: gpio@20000 {\n" "> > +\t\t\t\tcompatible = \"snps,dw-apb-gpio\";\n" "> > +\t\t\t\treg = <0x20000 0x1000>;\n" "> > +\t\t\t\t#address-cells = <1>;\n" "> > +\t\t\t\t#size-cells = <0>;\n" "> > +\t\t\t\treg-io-width = <4>;\n" "> > +\n" - "> > +\t\t\t\tbanka: gpio-controller at 0 {\n" + "> > +\t\t\t\tbanka: gpio-controller@0 {\n" "> > +\t\t\t\t\tcompatible = \"snps,dw-apb-gpio-bank\";\n" "> > +\t\t\t\t\tgpio-controller;\n" "> > +\t\t\t\t\t#gpio-cells = <2>;\n" @@ -250,7 +253,7 @@ "> > +\t\t\t\t\tregoffset-dirout = <0x04>;\n" "> > +\t\t\t\t};\n" "> > +\n" - "> > +\t\t\t\tbankb: gpio-controller at 1 {\n" + "> > +\t\t\t\tbankb: gpio-controller@1 {\n" "> > +\t\t\t\t\tcompatible = \"snps,dw-apb-gpio-bank\";\n" "> > +\t\t\t\t\tgpio-controller;\n" "> > +\t\t\t\t\t#gpio-cells = <2>;\n" @@ -262,9 +265,9 @@ "> > +\t\t\t\t};\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\tuart0: uart at 30000 {\n" + "> > +\t\t\tuart0: uart@30000 {\n" "> \n" - "> Preferred name is serial at 30000\n" + "> Preferred name is serial@30000\n" "\n" "OK.\n" "\n" @@ -277,7 +280,7 @@ "> > +\t\t\t\treg-io-width = <4>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\tuart1: uart at 40000 {\n" + "> > +\t\t\tuart1: uart@40000 {\n" "> > +\t\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> > +\t\t\t\treg = <0x40000 0x1000>;\n" "> > +\t\t\t\tinterrupt-parent = <&vic1>;\n" @@ -287,7 +290,7 @@ "> > +\t\t\t\treg-io-width = <4>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\twdog: watchdog at 50000 {\n" + "> > +\t\t\twdog: watchdog@50000 {\n" "> > +\t\t\t\tcompatible = \"snps,dw-apb-wdg\";\n" "> > +\t\t\t\treg = <0x50000 0x10000>;\n" "> > +\t\t\t\tinterrupt-parent = <&vic0>;\n" @@ -303,7 +306,7 @@ "> > +\t\tcompatible = \"simple-bus\";\n" "> > +\t\tranges;\n" "> > +\n" - "> > +\t\tebi at 50000000 {\n" + "> > +\t\tebi@50000000 {\n" "> > +\t\t\tcompatible = \"simple-bus\";\n" "> > +\t\t\t#address-cells = <2>;\n" "> > +\t\t\t#size-cells = <1>;\n" @@ -313,7 +316,7 @@ "> > +\t\t\t\t 3 0 0x58000000 0x08000000>;\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\taxi2pico at c0000000 {\n" + "> > +\t\taxi2pico@c0000000 {\n" "> > +\t\t\tcompatible = \"picochip,axi2pico-pc3x2\";\n" "> > +\t\t\treg = <0xc0000000 0x10000>;\n" "> > +\t\t\tinterrupts = <13 14 15 16 17 18 19 20 21>;\n" @@ -329,4 +332,4 @@ "aren't full drivers/bindings for them yet. I could remove the unused \n" peripherals for now if you think appropriate though. -dc8cdd300418ea0fb29a87da9020200bd443110da4c83fd299a7fc970fe72040 +551004e5537d172c6d98b1cf58fb9d9d9d5e474925beb9881a0172a626444049
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.