diff for duplicates of <550C9490.3070505@ti.com> diff --git a/a/1.txt b/N1/1.txt index cd0ae2f..7287d46 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,12 +61,12 @@ On 03/20/2015 01:44 PM, Kristo, Tero wrote: > }; > }; > -> - am33xx_control_module: control_module@4a002000 { +> - am33xx_control_module: control_module at 4a002000 { > - compatible = "syscon"; > - reg = <0x44e10000 0x7fc>; > - }; > - -> - am33xx_pinmux: pinmux@44e10800 { +> - am33xx_pinmux: pinmux at 44e10800 { > - compatible = "pinctrl-single"; > - reg = <0x44e10800 0x0238>; > - #address-cells = <1>; @@ -82,7 +82,7 @@ On 03/20/2015 01:44 PM, Kristo, Tero wrote: > ranges; > ti,hwmods = "l3_main"; > -> - prcm: prcm@44e00000 { +> - prcm: prcm at 44e00000 { > - compatible = "ti,am3-prcm"; > - reg = <0x44e00000 0x4000>; > - @@ -90,7 +90,7 @@ On 03/20/2015 01:44 PM, Kristo, Tero wrote: > - #address-cells = <1>; > - #size-cells = <0>; > - }; -> + l4_wkup: l4_wkup@44c00000 { +> + l4_wkup: l4_wkup at 44c00000 { > + compatible = "ti,am3-l4-wkup", "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; @@ -99,11 +99,11 @@ On 03/20/2015 01:44 PM, Kristo, Tero wrote: > - prcm_clockdomains: clockdomains { > - }; > - }; -> + prcm: prcm@200000 { +> + prcm: prcm at 200000 { > + compatible = "ti,am3-prcm"; > + reg = <0x200000 0x4000>; > -> - scrm: scrm@44e10000 { +> - scrm: scrm at 44e10000 { > - compatible = "ti,am3-scrm"; > - reg = <0x44e10000 0x2000>; > + prcm_clocks: clocks { @@ -119,14 +119,14 @@ On 03/20/2015 01:44 PM, Kristo, Tero wrote: > }; > > - scrm_clockdomains: clockdomains { -> + 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>; @@ -135,7 +135,7 @@ On 03/20/2015 01:44 PM, Kristo, Tero wrote: > + pinctrl-single,function-mask = <0x7f>; > + }; > + -> + scm_conf: scm_conf@0 { +> + scm_conf: scm_conf at 0 { > + compatible = "syscon"; > + reg = <0x0 0x7fc>; @@ -158,7 +158,7 @@ I have to add the wkup_m3 node, and prefer ordering by addresses. > }; > }; > -> - cm: syscon@44e10000 { +> - cm: syscon at 44e10000 { > - compatible = "ti,am33xx-controlmodule", "syscon"; > - reg = <0x44e10000 0x800>; > - }; diff --git a/a/content_digest b/N1/content_digest index 5d78a1d..86f1ccb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01426877086-17131-1-git-send-email-t-kristo@ti.com\0" "ref\01426877086-17131-28-git-send-email-t-kristo@ti.com\0" - "From\0Suman Anna <s-anna@ti.com>\0" - "Subject\0Re: [PATCHv5 27/35] ARM: dts: am33xx: add minimal l4 bus layout with control module support\0" + "From\0s-anna@ti.com (Suman Anna)\0" + "Subject\0[PATCHv5 27/35] ARM: dts: am33xx: add minimal l4 bus layout with control module support\0" "Date\0Fri, 20 Mar 2015 16:43:44 -0500\0" - "To\0Kristo" - Tero <t-kristo@ti.com> - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - tony@atomide.com <tony@atomide.com> - paul@pwsan.com <paul@pwsan.com> - " sakari.ailus@iki.fi <sakari.ailus@iki.fi>\0" - "Cc\0linux-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" "Hi Tero,\n" @@ -75,12 +69,12 @@ "> \t\t};\n" "> \t};\n" "> \n" - "> -\tam33xx_control_module: control_module@4a002000 {\n" + "> -\tam33xx_control_module: control_module at 4a002000 {\n" "> -\t\tcompatible = \"syscon\";\n" "> -\t\treg = <0x44e10000 0x7fc>;\n" "> -\t};\n" "> -\n" - "> -\tam33xx_pinmux: pinmux@44e10800 {\n" + "> -\tam33xx_pinmux: pinmux at 44e10800 {\n" "> -\t\tcompatible = \"pinctrl-single\";\n" "> -\t\treg = <0x44e10800 0x0238>;\n" "> -\t\t#address-cells = <1>;\n" @@ -96,7 +90,7 @@ "> \t\tranges;\n" "> \t\tti,hwmods = \"l3_main\";\n" "> \n" - "> -\t\tprcm: prcm@44e00000 {\n" + "> -\t\tprcm: prcm at 44e00000 {\n" "> -\t\t\tcompatible = \"ti,am3-prcm\";\n" "> -\t\t\treg = <0x44e00000 0x4000>;\n" "> -\n" @@ -104,7 +98,7 @@ "> -\t\t\t\t#address-cells = <1>;\n" "> -\t\t\t\t#size-cells = <0>;\n" "> -\t\t\t};\n" - "> +\t\tl4_wkup: l4_wkup@44c00000 {\n" + "> +\t\tl4_wkup: l4_wkup at 44c00000 {\n" "> +\t\t\tcompatible = \"ti,am3-l4-wkup\", \"simple-bus\";\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" @@ -113,11 +107,11 @@ "> -\t\t\tprcm_clockdomains: clockdomains {\n" "> -\t\t\t};\n" "> -\t\t};\n" - "> +\t\t\tprcm: prcm@200000 {\n" + "> +\t\t\tprcm: prcm at 200000 {\n" "> +\t\t\t\tcompatible = \"ti,am3-prcm\";\n" "> +\t\t\t\treg = <0x200000 0x4000>;\n" "> \n" - "> -\t\tscrm: scrm@44e10000 {\n" + "> -\t\tscrm: scrm at 44e10000 {\n" "> -\t\t\tcompatible = \"ti,am3-scrm\";\n" "> -\t\t\treg = <0x44e10000 0x2000>;\n" "> +\t\t\t\tprcm_clocks: clocks {\n" @@ -133,14 +127,14 @@ "> \t\t\t};\n" "> \n" "> -\t\t\tscrm_clockdomains: clockdomains {\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" @@ -149,7 +143,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" @@ -172,7 +166,7 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> -\t\tcm: syscon@44e10000 {\n" + "> -\t\tcm: syscon at 44e10000 {\n" "> -\t\t\tcompatible = \"ti,am33xx-controlmodule\", \"syscon\";\n" "> -\t\t\treg = <0x44e10000 0x800>;\n" "> -\t\t};\n" @@ -181,4 +175,4 @@ "regards\n" Suman -75bf9d9435e651bb34f097a016eaaf165ffb5a2bb7b37ebae124ab1867df6819 +4542e21f952ebb498c53514f2725340a9833bbd8b234ba6ffbebacc33ea48eb5
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.