diff for duplicates of <4F22DF1D.5020904@ti.com> diff --git a/a/1.txt b/N1/1.txt index 5101243..9988372 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,14 +17,14 @@ index 2938ec8..2425108 100644 <0x48240100 0x0100>; }; -+ sdma: sdma@0 { ++ sdma: sdma at 0 { + compatible = "ti,omap4-sdma"; + ti,hwmods = "dma_system"; + dma-controller; + #dma-cells = <1>; + }; + - gpio1: gpio@1 { + gpio1: gpio at 1 { compatible = "ti,omap4-gpio"; ti,hwmods = "gpio1"; @@ -205,6 +212,8 @@ @@ -35,7 +35,7 @@ index 2938ec8..2425108 100644 + dma-request-names = "tx", "rx"; }; - i2c2: i2c@2 { + i2c2: i2c at 2 { @@ -212,6 +221,8 @@ #address-cells = <1>; #size-cells = <0>; @@ -44,7 +44,7 @@ index 2938ec8..2425108 100644 + dma-request-names = "tx", "rx"; }; - i2c3: i2c@3 { + i2c3: i2c at 3 { @@ -219,6 +230,8 @@ #address-cells = <1>; #size-cells = <0>; @@ -53,7 +53,7 @@ index 2938ec8..2425108 100644 + dma-request-names = "tx", "rx"; }; - i2c4: i2c@4 { + i2c4: i2c at 4 { @@ -226,6 +239,8 @@ #address-cells = <1>; #size-cells = <0>; @@ -62,6 +62,6 @@ index 2938ec8..2425108 100644 + dma-request-names = "tx", "rx"; }; - mcspi1: mcspi@1 { + mcspi1: mcspi at 1 { -- 1.7.0.4 diff --git a/a/content_digest b/N1/content_digest index bdd361b..044645d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,7 @@ - "From\0Cousson, Benoit <b-cousson@ti.com>\0" + "From\0b-cousson@ti.com (Cousson, Benoit)\0" "Subject\0[RFC PATCH 2/2] arm/dts: OMAP4: Add dma-controller and dma-request for I2C\0" "Date\0Fri, 27 Jan 2012 18:30:05 +0100\0" - "To\0Grant Likely <grant.likely@secretlab.ca>" - Rob Herring <rob.herring@calxeda.com> - Stephen Warren <swarren@nvidia.com> - " Thomas Abraham <thomas.abraham@linaro.org>\0" - "Cc\0devicetree-discuss@lists.ozlabs.org <devicetree-discuss@lists.ozlabs.org>" - linux-omap <linux-omap@vger.kernel.org> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the DMA controller node.\n" @@ -29,14 +23,14 @@ " \t\t\t <0x48240100 0x0100>;\n" " \t\t};\n" " \n" - "+\t\tsdma: sdma@0 {\n" + "+\t\tsdma: sdma at 0 {\n" "+\t\t\tcompatible = \"ti,omap4-sdma\";\n" "+\t\t\tti,hwmods = \"dma_system\";\n" "+\t\t\tdma-controller;\n" "+\t\t\t#dma-cells = <1>;\n" "+\t\t};\n" "+\n" - " \t\tgpio1: gpio@1 {\n" + " \t\tgpio1: gpio at 1 {\n" " \t\t\tcompatible = \"ti,omap4-gpio\";\n" " \t\t\tti,hwmods = \"gpio1\";\n" "@@ -205,6 +212,8 @@\n" @@ -47,7 +41,7 @@ "+\t\t\tdma-request-names = \"tx\", \"rx\";\n" " \t\t};\n" " \n" - " \t\ti2c2: i2c@2 {\n" + " \t\ti2c2: i2c at 2 {\n" "@@ -212,6 +221,8 @@\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -56,7 +50,7 @@ "+\t\t\tdma-request-names = \"tx\", \"rx\";\n" " \t\t};\n" " \n" - " \t\ti2c3: i2c@3 {\n" + " \t\ti2c3: i2c at 3 {\n" "@@ -219,6 +230,8 @@\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -65,7 +59,7 @@ "+\t\t\tdma-request-names = \"tx\", \"rx\";\n" " \t\t};\n" " \n" - " \t\ti2c4: i2c@4 {\n" + " \t\ti2c4: i2c at 4 {\n" "@@ -226,6 +239,8 @@\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -74,8 +68,8 @@ "+\t\t\tdma-request-names = \"tx\", \"rx\";\n" " \t\t};\n" " \n" - " \t\tmcspi1: mcspi@1 {\n" + " \t\tmcspi1: mcspi at 1 {\n" "-- \n" 1.7.0.4 -ffa9031df9a603f4b587071508135c15ed61c55ee22c5118d120ef9e3ed7d039 +dfe7c6f57eff02f5f55d870fb997c65ab49adff3a74bda8bf4c630deb8d40c9e
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.