diff for duplicates of <52D56F3E.2070304@atmel.com> diff --git a/a/1.txt b/N1/1.txt index b0b0c30..20c8a1e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -45,14 +45,14 @@ Ditto: remove comments. > + >; > + }; > + }; -> pioA: gpio at fffff400 { +> pioA: gpio@fffff400 { > compatible = "atmel,at91rm9200-gpio"; > reg = <0xfffff400 0x200>; > @@ -436,6 +462,15 @@ > }; > }; > -> + fb0: fb at 0x00600000 { +> + fb0: fb@0x00600000 { > + compatible = "atmel,at91sam9261-lcdc"; > + reg = <0x00600000 0x1000>; > + interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>; @@ -61,7 +61,7 @@ Ditto: remove comments. > + status = "disabled"; > + }; > + -> nand0: nand at 40000000 { +> nand0: nand@40000000 { > compatible = "atmel,at91rm9200-nand"; > #address-cells = <1>; > diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts @@ -73,7 +73,7 @@ Ditto: remove comments. > }; > }; > + -> + fb0: fb at 0x00600000 { +> + fb0: fb@0x00600000 { > + display = <&display0>; > + status = "okay"; diff --git a/a/content_digest b/N1/content_digest index e717106..0cc39c9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,13 @@ "ref\01389270709-32662-1-git-send-email-jjhiblot@traphandler.com\0" "ref\01389270709-32662-4-git-send-email-jjhiblot@traphandler.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH v2 03/12] at91: dt: sam9261: Added support for the lcd display\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH v2 03/12] at91: dt: sam9261: Added support for the lcd display\0" "Date\0Tue, 14 Jan 2014 18:09:18 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Jacques Hiblot <jjhiblot@traphandler.com>\0" + "Cc\0<b.brezillon@overkiz.com>" + <arnd@arndb.de> + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On 09/01/2014 13:31, Jean-Jacques Hiblot :\n" @@ -53,14 +57,14 @@ "> +\t\t\t\t\t\t\t >;\n" "> +\t\t\t\t\t};\n" "> +\t\t\t\t};\n" - "> \t\t\t\tpioA: gpio at fffff400 {\n" + "> \t\t\t\tpioA: gpio@fffff400 {\n" "> \t\t\t\t\tcompatible = \"atmel,at91rm9200-gpio\";\n" "> \t\t\t\t\treg = <0xfffff400 0x200>;\n" "> @@ -436,6 +462,15 @@\n" "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tfb0: fb at 0x00600000 {\n" + "> +\t\tfb0: fb@0x00600000 {\n" "> +\t\t\tcompatible = \"atmel,at91sam9261-lcdc\";\n" "> +\t\t\treg = <0x00600000 0x1000>;\n" "> +\t\t\tinterrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;\n" @@ -69,7 +73,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tnand0: nand at 40000000 {\n" + "> \t\tnand0: nand@40000000 {\n" "> \t\t\tcompatible = \"atmel,at91rm9200-nand\";\n" "> \t\t\t#address-cells = <1>;\n" "> diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts\n" @@ -81,7 +85,7 @@ "> \t\t\t};\n" "> \t\t};\n" "> +\n" - "> +\t\tfb0: fb at 0x00600000 {\n" + "> +\t\tfb0: fb@0x00600000 {\n" "> +\t\t\tdisplay = <&display0>;\n" "> +\t\t\tstatus = \"okay\";\n" "\n" @@ -136,4 +140,4 @@ "-- \n" Nicolas Ferre -f76a849951c206080d27fbbfbfb8f48c113b8ee6237eb620e4e1f9f5b748e19c +8992f539c7aad26ebc274154a0bea429bc8e488aaf83b0d6a0e88d3cb4f6db73
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.