diff for duplicates of <51DE0799.1090905@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 1eae762..f53b5b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,10 +15,10 @@ On 7/10/2013 22:38, Jean-Christophe PLAGNIOL-VILLARD wrote: >> +++ b/arch/arm/boot/dts/at91sam9n12ek.dts >> @@ -40,6 +40,15 @@ >> ->> i2c0: i2c at f8010000 { +>> i2c0: i2c@f8010000 { >> status = "okay"; >> + ->> + qt1070: keyboard at 1b { +>> + qt1070: keyboard@1b { >> + compatible = "qt1070"; >> + reg = <0x1b>; >> + interrupt-parent = <&pioA>; @@ -32,7 +32,7 @@ Thanks, I will use macro here. >> + }; >> }; >> ->> i2c1: i2c at f8014000 { +>> i2c1: i2c@f8014000 { >> @@ -66,6 +75,13 @@ >> <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PA7 gpio CD pin pull up and deglitch */ >> }; @@ -50,7 +50,7 @@ OK, I will drop the comment >> + }; >> }; >> ->> spi0: spi at f0000000 { +>> spi0: spi@f0000000 { >> -- > > Best Regards, diff --git a/a/content_digest b/N1/content_digest index 1b01c97..08eca29 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,15 @@ "ref\01373449869-5083-1-git-send-email-voice.shen@atmel.com\0" "ref\01373449869-5083-3-git-send-email-voice.shen@atmel.com\0" "ref\020130710143835.GG18012@ns203013.ovh.net\0" - "From\0voice.shen@atmel.com (Bo Shen)\0" - "Subject\0[PATCH 2/3] arm: atmel: at91sam9n12: add qt1070 support\0" + "From\0Bo Shen <voice.shen@atmel.com>\0" + "Subject\0Re: [PATCH 2/3] arm: atmel: at91sam9n12: add qt1070 support\0" "Date\0Thu, 11 Jul 2013 09:17:13 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" + "Cc\0Nicolas Ferre <nicolas.ferre@atmel.com>" + ludovic.desroches@atmel.com + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + " devicetree-discuss@lists.ozlabs.org\0" "\00:1\0" "b\0" "Hi J,\n" @@ -24,10 +29,10 @@ ">> +++ b/arch/arm/boot/dts/at91sam9n12ek.dts\n" ">> @@ -40,6 +40,15 @@\n" ">>\n" - ">> \t\t\ti2c0: i2c at f8010000 {\n" + ">> \t\t\ti2c0: i2c@f8010000 {\n" ">> \t\t\t\tstatus = \"okay\";\n" ">> +\n" - ">> +\t\t\t\tqt1070: keyboard at 1b {\n" + ">> +\t\t\t\tqt1070: keyboard@1b {\n" ">> +\t\t\t\t\tcompatible = \"qt1070\";\n" ">> +\t\t\t\t\treg = <0x1b>;\n" ">> +\t\t\t\t\tinterrupt-parent = <&pioA>;\n" @@ -41,7 +46,7 @@ ">> +\t\t\t\t};\n" ">> \t\t\t};\n" ">>\n" - ">> \t\t\ti2c1: i2c at f8014000 {\n" + ">> \t\t\ti2c1: i2c@f8014000 {\n" ">> @@ -66,6 +75,13 @@\n" ">> \t\t\t\t\t\t\t<AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;\t/* PA7 gpio CD pin pull up and deglitch */\n" ">> \t\t\t\t\t};\n" @@ -59,7 +64,7 @@ ">> +\t\t\t\t};\n" ">> \t\t\t};\n" ">>\n" - ">> \t\t\tspi0: spi at f0000000 {\n" + ">> \t\t\tspi0: spi@f0000000 {\n" ">> --\n" ">\n" "> Best Regards,\n" @@ -69,4 +74,4 @@ "Best Regards,\n" Bo Shen -ae6ca8fbd667a950be0dbd35aa42a93bc96f10ca51c6ba680ac88ed22a8019d2 +51ec982b7fc2a9ac35ba87b66473973eabed099e3a54f7ad101378b9c8c40542
diff --git a/a/1.txt b/N2/1.txt index 1eae762..f53b5b5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,10 +15,10 @@ On 7/10/2013 22:38, Jean-Christophe PLAGNIOL-VILLARD wrote: >> +++ b/arch/arm/boot/dts/at91sam9n12ek.dts >> @@ -40,6 +40,15 @@ >> ->> i2c0: i2c at f8010000 { +>> i2c0: i2c@f8010000 { >> status = "okay"; >> + ->> + qt1070: keyboard at 1b { +>> + qt1070: keyboard@1b { >> + compatible = "qt1070"; >> + reg = <0x1b>; >> + interrupt-parent = <&pioA>; @@ -32,7 +32,7 @@ Thanks, I will use macro here. >> + }; >> }; >> ->> i2c1: i2c at f8014000 { +>> i2c1: i2c@f8014000 { >> @@ -66,6 +75,13 @@ >> <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PA7 gpio CD pin pull up and deglitch */ >> }; @@ -50,7 +50,7 @@ OK, I will drop the comment >> + }; >> }; >> ->> spi0: spi at f0000000 { +>> spi0: spi@f0000000 { >> -- > > Best Regards, diff --git a/a/content_digest b/N2/content_digest index 1b01c97..f8fe9ef 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,15 @@ "ref\01373449869-5083-1-git-send-email-voice.shen@atmel.com\0" "ref\01373449869-5083-3-git-send-email-voice.shen@atmel.com\0" "ref\020130710143835.GG18012@ns203013.ovh.net\0" - "From\0voice.shen@atmel.com (Bo Shen)\0" - "Subject\0[PATCH 2/3] arm: atmel: at91sam9n12: add qt1070 support\0" + "From\0Bo Shen <voice.shen@atmel.com>\0" + "Subject\0Re: [PATCH 2/3] arm: atmel: at91sam9n12: add qt1070 support\0" "Date\0Thu, 11 Jul 2013 09:17:13 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" + "Cc\0Nicolas Ferre <nicolas.ferre@atmel.com>" + <ludovic.desroches@atmel.com> + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + " <devicetree-discuss@lists.ozlabs.org>\0" "\00:1\0" "b\0" "Hi J,\n" @@ -24,10 +29,10 @@ ">> +++ b/arch/arm/boot/dts/at91sam9n12ek.dts\n" ">> @@ -40,6 +40,15 @@\n" ">>\n" - ">> \t\t\ti2c0: i2c at f8010000 {\n" + ">> \t\t\ti2c0: i2c@f8010000 {\n" ">> \t\t\t\tstatus = \"okay\";\n" ">> +\n" - ">> +\t\t\t\tqt1070: keyboard at 1b {\n" + ">> +\t\t\t\tqt1070: keyboard@1b {\n" ">> +\t\t\t\t\tcompatible = \"qt1070\";\n" ">> +\t\t\t\t\treg = <0x1b>;\n" ">> +\t\t\t\t\tinterrupt-parent = <&pioA>;\n" @@ -41,7 +46,7 @@ ">> +\t\t\t\t};\n" ">> \t\t\t};\n" ">>\n" - ">> \t\t\ti2c1: i2c at f8014000 {\n" + ">> \t\t\ti2c1: i2c@f8014000 {\n" ">> @@ -66,6 +75,13 @@\n" ">> \t\t\t\t\t\t\t<AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;\t/* PA7 gpio CD pin pull up and deglitch */\n" ">> \t\t\t\t\t};\n" @@ -59,7 +64,7 @@ ">> +\t\t\t\t};\n" ">> \t\t\t};\n" ">>\n" - ">> \t\t\tspi0: spi at f0000000 {\n" + ">> \t\t\tspi0: spi@f0000000 {\n" ">> --\n" ">\n" "> Best Regards,\n" @@ -69,4 +74,4 @@ "Best Regards,\n" Bo Shen -ae6ca8fbd667a950be0dbd35aa42a93bc96f10ca51c6ba680ac88ed22a8019d2 +c1f8c5f00f33c55e18faca2dc72295a8d5da9eb996c3fba783cc65baf325fac8
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.