diff for duplicates of <5356A562.2090403@gmail.com> diff --git a/a/1.txt b/N1/1.txt index abf0e89..ddaced3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On 04/22/2014 06:28 PM, Thomas Petazzoni wrote: -> Dear Antoine Ténart, +> Dear Antoine T?nart, > -> On Tue, 22 Apr 2014 17:38:22 +0200, Antoine Ténart wrote: +> On Tue, 22 Apr 2014 17:38:22 +0200, Antoine T?nart wrote: >> The BG2Q has an AHCI SATA controller. Add the corresponding node >> in its device tree. > @@ -20,19 +20,19 @@ Sebastian >> }; >> }; >> ->> + ahci: sata@e90000 { +>> + ahci: sata at e90000 { >> + compatible = "marvell,berlin-ahci"; >> + reg = <0xe90000 0x10000>; >> + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; >> + status = "disable"; >> + }; >> + ->> + generic-regs@ea0110 { +>> + generic-regs at ea0110 { >> + compatible = "marvell,berlin-generic-regs", "syscon"; >> + reg = <0xea0110 0x10>; >> + }; >> + ->> apb@fc0000 { +>> apb at fc0000 { >> compatible = "simple-bus"; >> #address-cells = <1>; > diff --git a/a/content_digest b/N1/content_digest index d2b0867..60ee9ac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,16 @@ "ref\01398181105-19714-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01398181105-19714-4-git-send-email-antoine.tenart@free-electrons.com\0" "ref\020140422182802.447c2912@skate\0" - "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" - "Subject\0Re: [PATCH 3/6] ARM: berlin: add the AHCI node for the BG2Q\0" + "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" + "Subject\0[PATCH 3/6] ARM: berlin: add the AHCI node for the BG2Q\0" "Date\0Tue, 22 Apr 2014 19:22:42 +0200\0" - "To\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>" - " Antoine T\303\251nart <antoine.tenart@free-electrons.com>\0" - "Cc\0tj@kernel.org" - zmxu@marvell.com - jszhang@marvell.com - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-ide@vger.kernel.org - alexandre.belloni@free-electrons.com - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 04/22/2014 06:28 PM, Thomas Petazzoni wrote:\n" - "> Dear Antoine T\303\203\302\251nart,\n" + "> Dear Antoine T?nart,\n" "> \n" - "> On Tue, 22 Apr 2014 17:38:22 +0200, Antoine T\303\203\302\251nart wrote:\n" + "> On Tue, 22 Apr 2014 17:38:22 +0200, Antoine T?nart wrote:\n" ">> The BG2Q has an AHCI SATA controller. Add the corresponding node\n" ">> in its device tree.\n" "> \n" @@ -38,23 +29,23 @@ ">> \t\t\t};\n" ">> \t\t};\n" ">> \n" - ">> +\t\tahci: sata@e90000 {\n" + ">> +\t\tahci: sata at e90000 {\n" ">> +\t\t\tcompatible = \"marvell,berlin-ahci\";\n" ">> +\t\t\treg = <0xe90000 0x10000>;\n" ">> +\t\t\tinterrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;\n" ">> +\t\t\tstatus = \"disable\";\n" ">> +\t\t};\n" ">> +\n" - ">> +\t\tgeneric-regs@ea0110 {\n" + ">> +\t\tgeneric-regs at ea0110 {\n" ">> +\t\t\tcompatible = \"marvell,berlin-generic-regs\", \"syscon\";\n" ">> +\t\t\treg = <0xea0110 0x10>;\n" ">> +\t\t};\n" ">> +\n" - ">> \t\tapb@fc0000 {\n" + ">> \t\tapb at fc0000 {\n" ">> \t\t\tcompatible = \"simple-bus\";\n" ">> \t\t\t#address-cells = <1>;\n" "> \n" "> \n" > -856f31dc32c799794a0d36a005f985cd199ee03bd7598e7326c2c25c698926aa +ff56fe7026c3630d2ebac452db9737220b300ffbbdf65e0b0808192d8210722a
diff --git a/a/1.txt b/N2/1.txt index abf0e89..e79033a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,7 +1,7 @@ On 04/22/2014 06:28 PM, Thomas Petazzoni wrote: -> Dear Antoine Ténart, +> Dear Antoine Ténart, > -> On Tue, 22 Apr 2014 17:38:22 +0200, Antoine Ténart wrote: +> On Tue, 22 Apr 2014 17:38:22 +0200, Antoine Ténart wrote: >> The BG2Q has an AHCI SATA controller. Add the corresponding node >> in its device tree. > diff --git a/a/content_digest b/N2/content_digest index d2b0867..7a871bf 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -17,9 +17,9 @@ "\00:1\0" "b\0" "On 04/22/2014 06:28 PM, Thomas Petazzoni wrote:\n" - "> Dear Antoine T\303\203\302\251nart,\n" + "> Dear Antoine T\303\251nart,\n" "> \n" - "> On Tue, 22 Apr 2014 17:38:22 +0200, Antoine T\303\203\302\251nart wrote:\n" + "> On Tue, 22 Apr 2014 17:38:22 +0200, Antoine T\303\251nart wrote:\n" ">> The BG2Q has an AHCI SATA controller. Add the corresponding node\n" ">> in its device tree.\n" "> \n" @@ -57,4 +57,4 @@ "> \n" > -856f31dc32c799794a0d36a005f985cd199ee03bd7598e7326c2c25c698926aa +47b0b96bf89b58e266c74134ecc50654b45204349b5c9565a646a1248b2aa2ae
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.