diff for duplicates of <6873084.DUBYG1ACKX@flexo> diff --git a/a/1.txt b/N1/1.txt index 2a3c4dd..fd7d4cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Tuesday 17 July 2012 13:19:43 Arnd Bergmann wrote: > On Sunday 15 July 2012, Florian Fainelli wrote: > > > + -> > + uart0: serial at 400dc000 { +> > + uart0: serial@400dc000 { > > + compatible = "ns16550"; > > + reg = <0x400dc000 0x20>; > > + clock-frequency = <50000000>; @@ -41,11 +41,11 @@ flash/localbus > > + 7 0 0x1c000000 0x4000000>; // flash/localbus > > + -> > + sdram: memory at 0,0 { +> > + sdram: memory@0,0 { > > + reg = <0 0 0>; > > + }; > > + -> > + nor: flash at 7,0 { +> > + nor: flash@7,0 { > > + reg = <7 0 0x4000000>; > > + compatible = "cfi-flash"; > > + bank-width = <1>; // 8-bit external @@ -70,25 +70,25 @@ The memory node is also overridden by the board-specific DTS files in subsequent patches. > -> > + usb0: ehci at 400fc000 { +> > + usb0: ehci@400fc000 { > > + compatible = "moschip,mcs814x-ehci", "usb-ehci"; > > + reg = <0x400fc000 0x74>; > > + interrupts = <2>; > > + }; > > + -> > + usb1: ohci at 400fd000 { +> > + usb1: ohci@400fd000 { > > + compatible = "moschip,mcs814x-ohci", "ohci-le"; > > + reg = <0x400fd000 0x74>; > > + interrupts = <11>; > > + }; > > + -> > + usb2: ohci at 400fe000 { +> > + usb2: ohci@400fe000 { > > + compatible = "moschip,mcs814x-ohci", "ohci-le"; > > + reg = <0x400fe000 0x74>; > > + interrupts = <12>; > > + }; > > + -> > + usb3: otg at 400ff000 { +> > + usb3: otg@400ff000 { > > + compatible = "moschip,msc814x-otg", "usb-otg"; > > + reg = <0x400ff000 0x1000>; > > + interrupts = <13>; diff --git a/a/content_digest b/N1/content_digest index 771ec76..a3fd80f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,20 @@ "ref\01342363754-30808-1-git-send-email-florian@openwrt.org\0" "ref\01342363754-30808-3-git-send-email-florian@openwrt.org\0" "ref\0201207171319.43593.arnd@arndb.de\0" - "From\0florian@openwrt.org (Florian Fainelli)\0" - "Subject\0[PATCH 2/8] ARM: MCS814x: add Device Tree based MCS8140 board support\0" + "From\0Florian Fainelli <florian@openwrt.org>\0" + "Subject\0Re: [PATCH 2/8] ARM: MCS814x: add Device Tree based MCS8140 board support\0" "Date\0Tue, 17 Jul 2012 15:34:47 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0olof@lixom.net" + devicetree-discuss@lists.ozlabs.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tuesday 17 July 2012 13:19:43 Arnd Bergmann wrote:\n" "> On Sunday 15 July 2012, Florian Fainelli wrote:\n" "> \n" "> > +\n" - "> > +\t\t\tuart0: serial at 400dc000 {\n" + "> > +\t\t\tuart0: serial@400dc000 {\n" "> > +\t\t\t\tcompatible = \"ns16550\";\n" "> > +\t\t\t\treg = <0x400dc000 0x20>;\n" "> > +\t\t\t\tclock-frequency = <50000000>;\n" @@ -50,11 +53,11 @@ "> > +\t\t\t\t\t 7 0 0x1c000000 0x4000000>;\t// \n" "flash/localbus\n" "> > +\n" - "> > +\t\t\t\tsdram: memory at 0,0 {\n" + "> > +\t\t\t\tsdram: memory@0,0 {\n" "> > +\t\t\t\t\treg = <0 0 0>;\n" "> > +\t\t\t\t};\n" "> > +\n" - "> > +\t\t\t\tnor: flash at 7,0 {\n" + "> > +\t\t\t\tnor: flash@7,0 {\n" "> > +\t\t\t\t\treg = <7 0 0x4000000>;\n" "> > +\t\t\t\t\tcompatible = \"cfi-flash\";\n" "> > +\t\t\t\t\tbank-width = <1>;\t\t// 8-bit external \n" @@ -79,25 +82,25 @@ "patches.\n" "\n" "> \n" - "> > +\t\t\tusb0: ehci at 400fc000 {\n" + "> > +\t\t\tusb0: ehci@400fc000 {\n" "> > +\t\t\t\tcompatible = \"moschip,mcs814x-ehci\", \"usb-ehci\";\n" "> > +\t\t\t\treg = <0x400fc000 0x74>;\n" "> > +\t\t\t\tinterrupts = <2>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\tusb1: ohci at 400fd000 {\n" + "> > +\t\t\tusb1: ohci@400fd000 {\n" "> > +\t\t\t\tcompatible = \"moschip,mcs814x-ohci\", \"ohci-le\";\n" "> > +\t\t\t\treg = <0x400fd000 0x74>;\n" "> > +\t\t\t\tinterrupts = <11>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\tusb2: ohci at 400fe000 {\n" + "> > +\t\t\tusb2: ohci@400fe000 {\n" "> > +\t\t\t\tcompatible = \"moschip,mcs814x-ohci\", \"ohci-le\";\n" "> > +\t\t\t\treg = <0x400fe000 0x74>;\n" "> > +\t\t\t\tinterrupts = <12>;\n" "> > +\t\t\t};\n" "> > +\n" - "> > +\t\t\tusb3: otg at 400ff000 {\n" + "> > +\t\t\tusb3: otg@400ff000 {\n" "> > +\t\t\t\tcompatible = \"moschip,msc814x-otg\", \"usb-otg\";\n" "> > +\t\t\t\treg = <0x400ff000 0x1000>;\n" "> > +\t\t\t\tinterrupts = <13>;\n" @@ -137,4 +140,4 @@ "> \n" "> \tArnd" -d61632323c82681f9b9fb95cdc56e5e568f5c60a017d0bfb4935e88945917e57 +9565322f644648dbec9ffb96a4ba4409c3c774745cb01e3a4076b80e98d74574
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.