diff for duplicates of <4FB58A7A.4060606@gmail.com> diff --git a/a/1.txt b/N1/1.txt index a0148d2..fb4fbb7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com> > --- linux-2.6.orig/arch/arm/boot/dts/lpc32xx.dtsi > +++ linux-2.6/arch/arm/boot/dts/lpc32xx.dtsi > @@ -249,6 +249,8 @@ -> key@40050000 { +> key at 40050000 { > compatible = "nxp,lpc3220-key"; > reg = <0x40050000 0x1000>; > + interrupts = <54 0>; @@ -36,11 +36,11 @@ Acked-by: Rob Herring <rob.herring@calxeda.com> > --- linux-2.6.orig/arch/arm/boot/dts/phy3250.dts > +++ linux-2.6/arch/arm/boot/dts/phy3250.dts > @@ -135,6 +135,15 @@ -> tsc@40048000 { +> tsc at 40048000 { > status = "okay"; > }; > + -> + key@40050000 { +> + key at 40050000 { > + status = "okay"; > + keypad,num-rows = <1>; > + keypad,num-columns = <1>; @@ -64,5 +64,5 @@ Acked-by: Rob Herring <rob.herring@calxeda.com> > CLKDEV_INIT("40048000.adc", NULL, &clk_adc), > _______________________________________________ > devicetree-discuss mailing list -> devicetree-discuss@lists.ozlabs.org +> devicetree-discuss at lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss diff --git a/a/content_digest b/N1/content_digest index 72b33ea..b718153 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,9 @@ "ref\01337199955-26441-1-git-send-email-stigge@antcom.de\0" "ref\01337199955-26441-2-git-send-email-stigge@antcom.de\0" - "From\0Rob Herring <robherring2@gmail.com>\0" - "Subject\0Re: [PATCH RESEND v3 2/2] ARM: LPC32xx: Make platform use key driver\0" + "From\0robherring2@gmail.com (Rob Herring)\0" + "Subject\0[PATCH RESEND v3 2/2] ARM: LPC32xx: Make platform use key driver\0" "Date\0Thu, 17 May 2012 18:32:10 -0500\0" - "To\0Roland Stigge <stigge@antcom.de>\0" - "Cc\0dmitry.torokhov@gmail.com" - axel.lin@gmail.com - riyer@nvidia.com - michael.hennerich@analog.com - grant.likely@secretlab.ca - linux-input@vger.kernel.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - kevin.wells@nxp.com - srinivas.bakki@nxp.com - devicetree-discuss@lists.ozlabs.org - " rob.herring@calxeda.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 05/16/2012 03:25 PM, Roland Stigge wrote:\n" @@ -45,7 +33,7 @@ "> --- linux-2.6.orig/arch/arm/boot/dts/lpc32xx.dtsi\n" "> +++ linux-2.6/arch/arm/boot/dts/lpc32xx.dtsi\n" "> @@ -249,6 +249,8 @@\n" - "> \t\t\tkey@40050000 {\n" + "> \t\t\tkey at 40050000 {\n" "> \t\t\t\tcompatible = \"nxp,lpc3220-key\";\n" "> \t\t\t\treg = <0x40050000 0x1000>;\n" "> +\t\t\t\tinterrupts = <54 0>;\n" @@ -56,11 +44,11 @@ "> --- linux-2.6.orig/arch/arm/boot/dts/phy3250.dts\n" "> +++ linux-2.6/arch/arm/boot/dts/phy3250.dts\n" "> @@ -135,6 +135,15 @@\n" - "> \t\t\ttsc@40048000 {\n" + "> \t\t\ttsc at 40048000 {\n" "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tkey@40050000 {\n" + "> +\t\t\tkey at 40050000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\tkeypad,num-rows = <1>;\n" "> +\t\t\t\tkeypad,num-columns = <1>;\n" @@ -84,7 +72,7 @@ "> \tCLKDEV_INIT(\"40048000.adc\", NULL, &clk_adc),\n" "> _______________________________________________\n" "> devicetree-discuss mailing list\n" - "> devicetree-discuss@lists.ozlabs.org\n" + "> devicetree-discuss at lists.ozlabs.org\n" > https://lists.ozlabs.org/listinfo/devicetree-discuss -c429d17215ec3299ecab56c9e61d41fd9e76d55d6130d63c52c21f92e0ac3aaa +721d20c3f167729dc9c416c61b02c71871374b40e191fd925f217878ea10a78d
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.