diff for duplicates of <510E5CC1.8050801@ti.com> diff --git a/a/1.txt b/N1/1.txt index 8a16119..109a55c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,14 +22,14 @@ On 1/29/2013 1:08 PM, Vishwanathrao Badarkhe, Manish wrote: > --- a/arch/arm/boot/dts/da850-evm.dts > +++ b/arch/arm/boot/dts/da850-evm.dts > @@ -27,6 +27,11 @@ -> serial2: serial at 1d0d000 { +> serial2: serial@1d0d000 { > status = "okay"; > }; -> + i2c0: i2c0 at 1c22000 { +> + i2c0: i2c0@1c22000 { This should be: -i2c0: i2c at 1c22000 +i2c0: i2c@1c22000 inline with what has been done in rest of this file. @@ -38,7 +38,7 @@ inline with what has been done in rest of this file. > + pinctrl-0 = <&i2c0_pins>; > + }; > }; -> nand_cs3 at 62000000 { +> nand_cs3@62000000 { > status = "okay"; > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > index 5e0eb5c..245ab9a 100644 @@ -55,13 +55,13 @@ inline with what has been done in rest of this file. > + >; > + }; > }; -> serial0: serial at 1c42000 { +> serial0: serial@1c42000 { > compatible = "ns16550a"; > @@ -81,6 +87,15 @@ > interrupts = <61>; > status = "disabled"; > }; -> + i2c0: i2c0 at 1c22000 { +> + i2c0: i2c0@1c22000 { > + compatible = "ti,davinci-i2c"; > + reg = <0x22000 0x1000>; > + clock-frequency = <100000>; diff --git a/a/content_digest b/N1/content_digest index f55efe8..831087f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,26 @@ "ref\01359445134-13323-1-git-send-email-manishv.b@ti.com\0" "ref\01359445134-13323-4-git-send-email-manishv.b@ti.com\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH V2 3/6] ARM: davinci: da850: add DT node for I2C0\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH V2 3/6] ARM: davinci: da850: add DT node for I2C0\0" "Date\0Sun, 3 Feb 2013 18:19:05 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Vishwanathrao Badarkhe" + " Manish <manishv.b@ti.com>\0" + "Cc\0devicetree-discuss@lists.ozlabs.org" + linux-doc@vger.kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + davinci-linux-open-source@linux.davincidsp.com + anilkumar@ti.com + tony@atomide.com + hs@denx.de + broonie@opensource.wolfsonmicro.com + sameo@linux.intel.com + khilman@deeprootsystems.com + linus.walleij@linaro.org + linux@arm.linux.org.uk + rob@landley.net + rob.herring@calxeda.com + " grant.likely@secretlab.ca\0" "\00:1\0" "b\0" "\n" @@ -30,14 +47,14 @@ "> --- a/arch/arm/boot/dts/da850-evm.dts\n" "> +++ b/arch/arm/boot/dts/da850-evm.dts\n" "> @@ -27,6 +27,11 @@\n" - "> \t\tserial2: serial at 1d0d000 {\n" + "> \t\tserial2: serial@1d0d000 {\n" "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" - "> +\t\ti2c0: i2c0 at 1c22000 {\n" + "> +\t\ti2c0: i2c0@1c22000 {\n" "\n" "This should be:\n" "\n" - "i2c0: i2c at 1c22000\n" + "i2c0: i2c@1c22000\n" "\n" "inline with what has been done in rest of this file.\n" "\n" @@ -46,7 +63,7 @@ "> +\t\t\tpinctrl-0 = <&i2c0_pins>;\n" "> +\t\t};\n" "> \t};\n" - "> \tnand_cs3 at 62000000 {\n" + "> \tnand_cs3@62000000 {\n" "> \t\tstatus = \"okay\";\n" "> diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi\n" "> index 5e0eb5c..245ab9a 100644\n" @@ -63,13 +80,13 @@ "> +\t\t\t\t>;\n" "> +\t\t\t};\n" "> \t\t};\n" - "> \t\tserial0: serial at 1c42000 {\n" + "> \t\tserial0: serial@1c42000 {\n" "> \t\t\tcompatible = \"ns16550a\";\n" "> @@ -81,6 +87,15 @@\n" "> \t\t\tinterrupts = <61>;\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" - "> +\t\ti2c0: i2c0 at 1c22000 {\n" + "> +\t\ti2c0: i2c0@1c22000 {\n" "> +\t\t\tcompatible = \"ti,davinci-i2c\";\n" "> +\t\t\treg = <0x22000 0x1000>;\n" "> +\t\t\tclock-frequency = <100000>;\n" @@ -83,4 +100,4 @@ "Thanks,\n" Sekhar -3452fd0c9ff5fb49bd5c3b5d606e65e9cfc61b2177f8a93825fa565ba5c4d313 +0a36892951c9be88d7a94e2f8ae1121b94229ec66b4ee79d85bdeb50442b06dd
diff --git a/a/1.txt b/N2/1.txt index 8a16119..109a55c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -22,14 +22,14 @@ On 1/29/2013 1:08 PM, Vishwanathrao Badarkhe, Manish wrote: > --- a/arch/arm/boot/dts/da850-evm.dts > +++ b/arch/arm/boot/dts/da850-evm.dts > @@ -27,6 +27,11 @@ -> serial2: serial at 1d0d000 { +> serial2: serial@1d0d000 { > status = "okay"; > }; -> + i2c0: i2c0 at 1c22000 { +> + i2c0: i2c0@1c22000 { This should be: -i2c0: i2c at 1c22000 +i2c0: i2c@1c22000 inline with what has been done in rest of this file. @@ -38,7 +38,7 @@ inline with what has been done in rest of this file. > + pinctrl-0 = <&i2c0_pins>; > + }; > }; -> nand_cs3 at 62000000 { +> nand_cs3@62000000 { > status = "okay"; > diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi > index 5e0eb5c..245ab9a 100644 @@ -55,13 +55,13 @@ inline with what has been done in rest of this file. > + >; > + }; > }; -> serial0: serial at 1c42000 { +> serial0: serial@1c42000 { > compatible = "ns16550a"; > @@ -81,6 +87,15 @@ > interrupts = <61>; > status = "disabled"; > }; -> + i2c0: i2c0 at 1c22000 { +> + i2c0: i2c0@1c22000 { > + compatible = "ti,davinci-i2c"; > + reg = <0x22000 0x1000>; > + clock-frequency = <100000>; diff --git a/a/content_digest b/N2/content_digest index f55efe8..61359b2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,26 @@ "ref\01359445134-13323-1-git-send-email-manishv.b@ti.com\0" "ref\01359445134-13323-4-git-send-email-manishv.b@ti.com\0" - "From\0nsekhar@ti.com (Sekhar Nori)\0" - "Subject\0[PATCH V2 3/6] ARM: davinci: da850: add DT node for I2C0\0" + "From\0Sekhar Nori <nsekhar@ti.com>\0" + "Subject\0Re: [PATCH V2 3/6] ARM: davinci: da850: add DT node for I2C0\0" "Date\0Sun, 3 Feb 2013 18:19:05 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Vishwanathrao Badarkhe" + " Manish <manishv.b@ti.com>\0" + "Cc\0<devicetree-discuss@lists.ozlabs.org>" + <linux-doc@vger.kernel.org> + <linux-kernel@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <davinci-linux-open-source@linux.davincidsp.com> + <anilkumar@ti.com> + <tony@atomide.com> + <hs@denx.de> + <broonie@opensource.wolfsonmicro.com> + <sameo@linux.intel.com> + <khilman@deeprootsystems.com> + <linus.walleij@linaro.org> + <linux@arm.linux.org.uk> + <rob@landley.net> + <rob.herring@calxeda.com> + " <grant.likely@secretlab.ca>\0" "\00:1\0" "b\0" "\n" @@ -30,14 +47,14 @@ "> --- a/arch/arm/boot/dts/da850-evm.dts\n" "> +++ b/arch/arm/boot/dts/da850-evm.dts\n" "> @@ -27,6 +27,11 @@\n" - "> \t\tserial2: serial at 1d0d000 {\n" + "> \t\tserial2: serial@1d0d000 {\n" "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" - "> +\t\ti2c0: i2c0 at 1c22000 {\n" + "> +\t\ti2c0: i2c0@1c22000 {\n" "\n" "This should be:\n" "\n" - "i2c0: i2c at 1c22000\n" + "i2c0: i2c@1c22000\n" "\n" "inline with what has been done in rest of this file.\n" "\n" @@ -46,7 +63,7 @@ "> +\t\t\tpinctrl-0 = <&i2c0_pins>;\n" "> +\t\t};\n" "> \t};\n" - "> \tnand_cs3 at 62000000 {\n" + "> \tnand_cs3@62000000 {\n" "> \t\tstatus = \"okay\";\n" "> diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi\n" "> index 5e0eb5c..245ab9a 100644\n" @@ -63,13 +80,13 @@ "> +\t\t\t\t>;\n" "> +\t\t\t};\n" "> \t\t};\n" - "> \t\tserial0: serial at 1c42000 {\n" + "> \t\tserial0: serial@1c42000 {\n" "> \t\t\tcompatible = \"ns16550a\";\n" "> @@ -81,6 +87,15 @@\n" "> \t\t\tinterrupts = <61>;\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" - "> +\t\ti2c0: i2c0 at 1c22000 {\n" + "> +\t\ti2c0: i2c0@1c22000 {\n" "> +\t\t\tcompatible = \"ti,davinci-i2c\";\n" "> +\t\t\treg = <0x22000 0x1000>;\n" "> +\t\t\tclock-frequency = <100000>;\n" @@ -83,4 +100,4 @@ "Thanks,\n" Sekhar -3452fd0c9ff5fb49bd5c3b5d606e65e9cfc61b2177f8a93825fa565ba5c4d313 +c4edec23928ba588bb0f00be4262562efdbb73e328ddbb645109537523fc70c6
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.