diff for duplicates of <55127B6C.5020900@ti.com> diff --git a/a/1.txt b/N1/1.txt index 7d34e19..200ac47 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,12 +49,12 @@ On 03/24/2015 10:10 PM, Suman Anna wrote: >> cache-level = <2>; >> }; >> ->> - am43xx_control_module: control_module@4a002000 { +>> - am43xx_control_module: control_module at 4a002000 { >> - compatible = "syscon"; >> - reg = <0x44e10000 0x7f4>; >> - }; >> - ->> - am43xx_pinmux: pinmux@44e10800 { +>> - am43xx_pinmux: pinmux at 44e10800 { >> - compatible = "ti,am437-padconf", "pinctrl-single"; >> - reg = <0x44e10800 0x31c>; >> - #address-cells = <1>; @@ -72,7 +72,7 @@ On 03/24/2015 10:10 PM, Suman Anna wrote: >> interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, >> <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; >> ->> - prcm: prcm@44df0000 { +>> - prcm: prcm at 44df0000 { >> - compatible = "ti,am4-prcm"; >> - reg = <0x44df0000 0x11000>; >> - @@ -80,7 +80,7 @@ On 03/24/2015 10:10 PM, Suman Anna wrote: >> - #address-cells = <1>; >> - #size-cells = <0>; >> - }; ->> + l4_wkup: l4_wkup@44c00000 { +>> + l4_wkup: l4_wkup at 44c00000 { >> + compatible = "ti,am4-l4-wkup", "simple-bus"; >> + #address-cells = <1>; >> + #size-cells = <1>; @@ -89,11 +89,11 @@ On 03/24/2015 10:10 PM, Suman Anna wrote: >> - prcm_clockdomains: clockdomains { >> - }; >> - }; ->> + prcm: prcm@1f0000 { +>> + prcm: prcm at 1f0000 { >> + compatible = "ti,am4-prcm"; >> + reg = <0x1f0000 0x11000>; >> ->> - scrm: scrm@44e10000 { +>> - scrm: scrm at 44e10000 { >> - compatible = "ti,am4-scrm"; >> - reg = <0x44e10000 0x2000>; >> + prcm_clocks: clocks { @@ -109,7 +109,7 @@ On 03/24/2015 10:10 PM, Suman Anna wrote: >> }; >> >> - scrm_clockdomains: clockdomains { ->> + scm: scm@210000 { +>> + scm: scm at 210000 { >> + compatible = "ti,am4-scm", "simple-bus"; >> + reg = <0x210000 0x1000>; > @@ -137,7 +137,7 @@ for the DISPPLL stuff if required. >> + #size-cells = <1>; >> + ranges = <0 0x210000 0x1000>; >> + ->> + am43xx_pinmux: pinmux@800 { +>> + am43xx_pinmux: pinmux at 800 { >> + compatible = "ti,am437-padconf", >> + "pinctrl-single"; >> + reg = <0x800 0x31c>; @@ -149,7 +149,7 @@ for the DISPPLL stuff if required. >> + pinctrl-single,function-mask = <0xffffffff>; >> + }; >> + ->> + scm_conf: scm_conf@0 { +>> + scm_conf: scm_conf at 0 { >> + compatible = "syscon"; >> + reg = <0x0 0x7fc>; >> + #address-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index bdc8ec8..28bba62 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,10 @@ "ref\01426877086-17131-1-git-send-email-t-kristo@ti.com\0" "ref\01426877086-17131-30-git-send-email-t-kristo@ti.com\0" "ref\05511C4CF.1020601@ti.com\0" - "From\0Tero Kristo <t-kristo@ti.com>\0" - "Subject\0Re: [PATCHv5 29/35] ARM: dts: am4372: add minimal l4 bus layout with control module support\0" + "From\0t-kristo@ti.com (Tero Kristo)\0" + "Subject\0[PATCHv5 29/35] ARM: dts: am4372: add minimal l4 bus layout with control module support\0" "Date\0Wed, 25 Mar 2015 11:10:04 +0200\0" - "To\0Suman Anna <s-anna@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" "On 03/24/2015 10:10 PM, Suman Anna wrote:\n" @@ -63,12 +58,12 @@ ">> \t\tcache-level = <2>;\n" ">> \t};\n" ">>\n" - ">> -\tam43xx_control_module: control_module@4a002000 {\n" + ">> -\tam43xx_control_module: control_module at 4a002000 {\n" ">> -\t\tcompatible = \"syscon\";\n" ">> -\t\treg = <0x44e10000 0x7f4>;\n" ">> -\t};\n" ">> -\n" - ">> -\tam43xx_pinmux: pinmux@44e10800 {\n" + ">> -\tam43xx_pinmux: pinmux at 44e10800 {\n" ">> -\t\tcompatible = \"ti,am437-padconf\", \"pinctrl-single\";\n" ">> -\t\treg = <0x44e10800 0x31c>;\n" ">> -\t\t#address-cells = <1>;\n" @@ -86,7 +81,7 @@ ">> \t\tinterrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,\n" ">> \t\t\t <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;\n" ">>\n" - ">> -\t\tprcm: prcm@44df0000 {\n" + ">> -\t\tprcm: prcm at 44df0000 {\n" ">> -\t\t\tcompatible = \"ti,am4-prcm\";\n" ">> -\t\t\treg = <0x44df0000 0x11000>;\n" ">> -\n" @@ -94,7 +89,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,am4-l4-wkup\", \"simple-bus\";\n" ">> +\t\t\t#address-cells = <1>;\n" ">> +\t\t\t#size-cells = <1>;\n" @@ -103,11 +98,11 @@ ">> -\t\t\tprcm_clockdomains: clockdomains {\n" ">> -\t\t\t};\n" ">> -\t\t};\n" - ">> +\t\t\tprcm: prcm@1f0000 {\n" + ">> +\t\t\tprcm: prcm at 1f0000 {\n" ">> +\t\t\t\tcompatible = \"ti,am4-prcm\";\n" ">> +\t\t\t\treg = <0x1f0000 0x11000>;\n" ">>\n" - ">> -\t\tscrm: scrm@44e10000 {\n" + ">> -\t\tscrm: scrm at 44e10000 {\n" ">> -\t\t\tcompatible = \"ti,am4-scrm\";\n" ">> -\t\t\treg = <0x44e10000 0x2000>;\n" ">> +\t\t\t\tprcm_clocks: clocks {\n" @@ -123,7 +118,7 @@ ">> \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,am4-scm\", \"simple-bus\";\n" ">> +\t\t\t\treg = <0x210000 0x1000>;\n" ">\n" @@ -151,7 +146,7 @@ ">> +\t\t\t\t#size-cells = <1>;\n" ">> +\t\t\t\tranges = <0 0x210000 0x1000>;\n" ">> +\n" - ">> +\t\t\t\tam43xx_pinmux: pinmux@800 {\n" + ">> +\t\t\t\tam43xx_pinmux: pinmux at 800 {\n" ">> +\t\t\t\t\tcompatible = \"ti,am437-padconf\",\n" ">> +\t\t\t\t\t\t \"pinctrl-single\";\n" ">> +\t\t\t\t\treg = <0x800 0x31c>;\n" @@ -163,7 +158,7 @@ ">> +\t\t\t\t\tpinctrl-single,function-mask = <0xffffffff>;\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" ">> +\t\t\t\t\t#address-cells = <1>;\n" @@ -184,4 +179,4 @@ "> [snip]\n" > -0ce313e5fbbee5b35adb6d168d935ca8a0933cfb870f041643ca7528973114b3 +1f468e04643fd242f801374225866e1e23d164820da3ed0033b1a6973361755e
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.