diff for duplicates of <5512CE12.6030301@ti.com> diff --git a/a/1.txt b/N1/1.txt index 2afc2a8..a090295 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,14 +3,14 @@ On 03/21/2015 01:30 AM, Tony Lindgren wrote: >> On 03/20/2015 05:35 PM, Tony Lindgren wrote: >>> * Suman Anna <s-anna@ti.com> [150320 14:44]: >>>> On 03/20/2015 01:44 PM, Kristo, Tero wrote: ->>>>> + scm: scm@210000 { +>>>>> + scm: scm at 210000 { >>>>> + compatible = "ti,am3-scm", "simple-bus"; >>>>> + reg = <0x210000 0x2000>; >>>>> + #address-cells = <1>; >>>>> + #size-cells = <1>; >>>>> + ranges = <0 0x210000 0x2000>; >>>>> + ->>>>> + am33xx_pinmux: pinmux@800 { +>>>>> + am33xx_pinmux: pinmux at 800 { >>>>> + compatible = "pinctrl-single"; >>>>> + reg = <0x800 0x238>; >>>>> + #address-cells = <1>; @@ -19,7 +19,7 @@ On 03/21/2015 01:30 AM, Tony Lindgren wrote: >>>>> + pinctrl-single,function-mask = <0x7f>; >>>>> + }; >>>>> + ->>>>> + scm_conf: scm_conf@0 { +>>>>> + scm_conf: scm_conf at 0 { >>>>> + compatible = "syscon"; >>>>> + reg = <0x0 0x7fc>; >>>> diff --git a/a/content_digest b/N1/content_digest index 1e0ee96..7f6d195 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,15 +4,10 @@ "ref\020150320223541.GV31346@atomide.com\0" "ref\0550CABD9.5060000@ti.com\0" "ref\020150320233043.GW31346@atomide.com\0" - "From\0Tero Kristo <t-kristo@ti.com>\0" - "Subject\0Re: [PATCHv5 27/35] ARM: dts: am33xx: add minimal l4 bus layout with control module support\0" + "From\0t-kristo@ti.com (Tero Kristo)\0" + "Subject\0[PATCHv5 27/35] ARM: dts: am33xx: add minimal l4 bus layout with control module support\0" "Date\0Wed, 25 Mar 2015 17:02:42 +0200\0" - "To\0Tony Lindgren <tony@atomide.com>" - " Suman Anna <s-anna@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org <linux-omap@vger.kernel.org>" - paul@pwsan.com <paul@pwsan.com> - sakari.ailus@iki.fi <sakari.ailus@iki.fi> - " 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" "On 03/21/2015 01:30 AM, Tony Lindgren wrote:\n" @@ -20,14 +15,14 @@ ">> On 03/20/2015 05:35 PM, Tony Lindgren wrote:\n" ">>> * Suman Anna <s-anna@ti.com> [150320 14:44]:\n" ">>>> On 03/20/2015 01:44 PM, Kristo, Tero wrote:\n" - ">>>>> +\t\t\tscm: scm@210000 {\n" + ">>>>> +\t\t\tscm: scm at 210000 {\n" ">>>>> +\t\t\t\tcompatible = \"ti,am3-scm\", \"simple-bus\";\n" ">>>>> +\t\t\t\treg = <0x210000 0x2000>;\n" ">>>>> +\t\t\t\t#address-cells = <1>;\n" ">>>>> +\t\t\t\t#size-cells = <1>;\n" ">>>>> +\t\t\t\tranges = <0 0x210000 0x2000>;\n" ">>>>> +\n" - ">>>>> +\t\t\t\tam33xx_pinmux: pinmux@800 {\n" + ">>>>> +\t\t\t\tam33xx_pinmux: pinmux at 800 {\n" ">>>>> +\t\t\t\t\tcompatible = \"pinctrl-single\";\n" ">>>>> +\t\t\t\t\treg = <0x800 0x238>;\n" ">>>>> +\t\t\t\t\t#address-cells = <1>;\n" @@ -36,7 +31,7 @@ ">>>>> +\t\t\t\t\tpinctrl-single,function-mask = <0x7f>;\n" ">>>>> +\t\t\t\t};\n" ">>>>> +\n" - ">>>>> +\t\t\t\tscm_conf: scm_conf@0 {\n" + ">>>>> +\t\t\t\tscm_conf: scm_conf at 0 {\n" ">>>>> +\t\t\t\t\tcompatible = \"syscon\";\n" ">>>>> +\t\t\t\t\treg = <0x0 0x7fc>;\n" ">>>>\n" @@ -62,4 +57,4 @@ "\n" -Tero -0c293d31914b28e2087a211aec24d6341cf35c38e068582974e5ca95db935d05 +00c90e41d81b0f7b11c500b280e6c9300b5278f6e77a77aef85dd8a8e3222298
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.