diff for duplicates of <52CED74B.3030806@overkiz.com> diff --git a/a/1.txt b/N1/1.txt index 57ebfc2..2bd160b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,14 +42,14 @@ On 09/01/2014 13:31, Jean-Jacques Hiblot wrote: > + >; > + }; > + }; -> 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>; @@ -58,7 +58,7 @@ On 09/01/2014 13:31, Jean-Jacques Hiblot wrote: > + 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 @@ -75,7 +75,7 @@ I think this should be taken out in another patch (first 9261 lcdc support, then ek board lcd def) :p. > + -> + fb0: fb at 0x00600000 { +> + fb0: fb@0x00600000 { > + display = <&display0>; > + status = "okay"; > + atmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>; diff --git a/a/content_digest b/N1/content_digest index 466e78d..ae303ba 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\0b.brezillon@overkiz.com (boris brezillon)\0" - "Subject\0[PATCH v2 03/12] at91: dt: sam9261: Added support for the lcd display\0" + "From\0boris brezillon <b.brezillon@overkiz.com>\0" + "Subject\0Re: [PATCH v2 03/12] at91: dt: sam9261: Added support for the lcd display\0" "Date\0Thu, 09 Jan 2014 18:07:23 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Jacques Hiblot <jjhiblot@traphandler.com>" + nicolas.ferre@atmel.com + " arnd@arndb.de\0" + "Cc\0linux-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 wrote:\n" @@ -50,14 +54,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" @@ -66,7 +70,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" @@ -83,7 +87,7 @@ "then ek board lcd def) :p.\n" "\n" "> +\n" - "> +\t\tfb0: fb at 0x00600000 {\n" + "> +\t\tfb0: fb@0x00600000 {\n" "> +\t\t\tdisplay = <&display0>;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t\tatmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>;\n" @@ -129,4 +133,4 @@ "> \tCLKDEV_CON_DEV_ID(\"spi_clk\", \"fffcc000.spi\", &spi1_clk),\n" "> \tCLKDEV_CON_DEV_ID(\"mci_clk\", \"fffa8000.mmc\", &mmc_clk)," -276d55dc20ca21010e7f2c17c11dbec47e458685eace8db97486ad7068f0657a +f06c411886cf629afe3aaaa8236fd2e6528caf3993a6b36487786a74e0706718
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.