diff for duplicates of <51499DB4.9080907@ti.com> diff --git a/a/1.txt b/N1/1.txt index 5f51dd3..92a640f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,38 +35,38 @@ Sekhar > reg = <0x21000 0x1000>; > status = "disabled"; > }; -> + ehrpwm0: ehrpwm at 01f00000 { +> + ehrpwm0: ehrpwm@01f00000 { > + compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm"; > + #pwm-cells = <3>; > + reg = <0x300000 0x2000>; > + status = "disabled"; > + }; -> + ehrpwm1: ehrpwm at 01f02000 { +> + ehrpwm1: ehrpwm@01f02000 { > + compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm"; > + #pwm-cells = <3>; > + reg = <0x302000 0x2000>; > + status = "disabled"; > + }; -> + ecap0: ecap at 01f06000 { +> + ecap0: ecap@01f06000 { > + compatible = "ti,da850-ecap", "ti,am33xx-ecap"; > + #pwm-cells = <3>; > + reg = <0x306000 0x80>; > + status = "disabled"; > + }; -> + ecap1: ecap at 01f07000 { +> + ecap1: ecap@01f07000 { > + compatible = "ti,da850-ecap", "ti,am33xx-ecap"; > + #pwm-cells = <3>; > + reg = <0x307000 0x80>; > + status = "disabled"; > + }; -> + ecap2: ecap at 01f08000 { +> + ecap2: ecap@01f08000 { > + compatible = "ti,da850-ecap", "ti,am33xx-ecap"; > + #pwm-cells = <3>; > + reg = <0x308000 0x80>; > + status = "disabled"; > + }; > }; -> nand_cs3 at 62000000 { +> nand_cs3@62000000 { > compatible = "ti,davinci-nand"; > diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c > index 6b7a0a2..89ee974 100644 diff --git a/a/content_digest b/N1/content_digest index 62ae6f8..9230510 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,15 @@ "ref\01363761714-15034-1-git-send-email-avinashphilip@ti.com\0" "ref\01363761714-15034-4-git-send-email-avinashphilip@ti.com\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH v2 3/3] ARM: davinci: da850: add EHRPWM & ECAP DT node\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH v2 3/3] ARM: davinci: da850: add EHRPWM & ECAP DT node\0" "Date\0Wed, 20 Mar 2013 16:59:56 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Philip Avinash <avinashphilip@ti.com>\0" + "Cc\0<linux@arm.linux.org.uk>" + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + <davinci-linux-open-source@linux.davincidsp.com> + <prakash.pm@ti.com> + " Peter Korsgaard <jacmet@sunsite.dk>\0" "\00:1\0" "b\0" "\n" @@ -43,38 +49,38 @@ "> \t\t\treg = <0x21000 0x1000>;\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" - "> +\t\tehrpwm0: ehrpwm at 01f00000 {\n" + "> +\t\tehrpwm0: ehrpwm@01f00000 {\n" "> +\t\t\tcompatible = \"ti,da850-ehrpwm\", \"ti,am33xx-ehrpwm\";\n" "> +\t\t\t#pwm-cells = <3>;\n" "> +\t\t\treg = <0x300000 0x2000>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" - "> +\t\tehrpwm1: ehrpwm at 01f02000 {\n" + "> +\t\tehrpwm1: ehrpwm@01f02000 {\n" "> +\t\t\tcompatible = \"ti,da850-ehrpwm\", \"ti,am33xx-ehrpwm\";\n" "> +\t\t\t#pwm-cells = <3>;\n" "> +\t\t\treg = <0x302000 0x2000>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" - "> +\t\tecap0: ecap at 01f06000 {\n" + "> +\t\tecap0: ecap@01f06000 {\n" "> +\t\t\tcompatible = \"ti,da850-ecap\", \"ti,am33xx-ecap\";\n" "> +\t\t\t#pwm-cells = <3>;\n" "> +\t\t\treg = <0x306000 0x80>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" - "> +\t\tecap1: ecap at 01f07000 {\n" + "> +\t\tecap1: ecap@01f07000 {\n" "> +\t\t\tcompatible = \"ti,da850-ecap\", \"ti,am33xx-ecap\";\n" "> +\t\t\t#pwm-cells = <3>;\n" "> +\t\t\treg = <0x307000 0x80>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" - "> +\t\tecap2: ecap at 01f08000 {\n" + "> +\t\tecap2: ecap@01f08000 {\n" "> +\t\t\tcompatible = \"ti,da850-ecap\", \"ti,am33xx-ecap\";\n" "> +\t\t\t#pwm-cells = <3>;\n" "> +\t\t\treg = <0x308000 0x80>;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> \t};\n" - "> \tnand_cs3 at 62000000 {\n" + "> \tnand_cs3@62000000 {\n" "> \t\tcompatible = \"ti,davinci-nand\";\n" "> diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c\n" "> index 6b7a0a2..89ee974 100644\n" @@ -94,4 +100,4 @@ "> \n" > -d7b352178330ddb89f1e459f0c32b179050fbd34939651ad873daa2d505e00b1 +a7779333dee1f1a5f8d16da009061540c97dc4b3c1d3a1886181f76b763b9d6c
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.