diff for duplicates of <550BC0C9.4030305@ti.com> diff --git a/a/1.txt b/N1/1.txt index f7c0b20..1410016 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ On 03/19/2015 10:25 PM, Tony Lindgren wrote: >>> --- a/arch/arm/boot/dts/omap4.dtsi >>> +++ b/arch/arm/boot/dts/omap4.dtsi >>> @@ -167,36 +167,65 @@ ->>> + scm: scm@4a002000 { +>>> + scm: scm at 4a002000 { >>> + compatible = "ti,omap4-ctrl", "simple-bus"; >>> + reg = <0x4a002000 0x1000>, >>> + <0x4a100000 0x1000>; @@ -61,13 +61,13 @@ Yes, I will be looking at this today. > interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; > -> l4_cfg: l4@4a000000 { +> l4_cfg: l4 at 4a000000 { > compatible = "ti,omap4-l4-cfg", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > ranges = <0 0x4a000000 0x1000000>; > -> cm1: cm1@4000 { +> cm1: cm1 at 4000 { > compatible = "ti,omap4-cm1"; > reg = <0x4000 0x2000>; > @@ -80,7 +80,7 @@ Yes, I will be looking at this today. > }; > }; > -> cm2: cm2@8000 { +> cm2: cm2 at 8000 { > compatible = "ti,omap4-cm2"; > reg = <0x8000 0x3000>; > @@ -93,13 +93,13 @@ Yes, I will be looking at this today. > }; > }; > -> omap4_scm_core: scm@100000 { +> omap4_scm_core: scm at 100000 { > compatible = "ti,omap4-scm-core", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > ranges = <0 0x100000 0x1000>; > -> omap4_pmx_core: pinmux@40 { +> omap4_pmx_core: pinmux at 40 { > compatible = "ti,omap4-padconf", "pinctrl-single"; > reg = <0x40 0x0196>; > #address-cells = <1>; @@ -110,7 +110,7 @@ Yes, I will be looking at this today. > pinctrl-single,function-mask = <0x7fff>; > }; > -> omap4_padconf_global: tisyscon@5a0 { +> omap4_padconf_global: tisyscon at 5a0 { > compatible = "syscon"; > reg = <0x5a0 0x170>; > #address-cells = <1>; @@ -129,19 +129,19 @@ Yes, I will be looking at this today. > }; > }; > -> l4_wkup: l4@300000 { +> l4_wkup: l4 at 300000 { > compatible = "ti,omap4-l4-wkup", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > ranges = <0 0x300000 0x40000>; > -> counter32k: counter@4000 { +> counter32k: counter at 4000 { > compatible = "ti,omap-counter32k"; > reg = <0x4000 0x20>; > ti,hwmods = "counter_32k"; > }; > -> prm: prm@6000 { +> prm: prm at 6000 { > compatible = "ti,omap4-prm"; > reg = <0x6000 0x3000>; > interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; @@ -155,7 +155,7 @@ Yes, I will be looking at this today. > }; > }; > -> scrm: scrm@a000 { +> scrm: scrm at a000 { > compatible = "ti,omap4-scrm"; > reg = <0xa000 0x2000>; > #address-cells = <1>; @@ -171,7 +171,7 @@ Yes, I will be looking at this today. > }; > }; > -> omap4_pmx_wkup: pinmux@1e040 { +> omap4_pmx_wkup: pinmux at 1e040 { > compatible = "ti,omap4-padconf", "pinctrl-single"; > reg = <0x1e040 0x0038>; > #address-cells = <1>; @@ -200,20 +200,20 @@ Yes, I will be looking at this today. > > ... > -> l4_core: l4@48000000 { +> l4_core: l4 at 48000000 { > compatible = "ti,omap3-l4-core", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > ranges = <0 0x48000000 0x1000000>; > -> scrm: scrm@48002000 { +> scrm: scrm at 48002000 { > compatible = "ti,omap3-scrm", "simple-bus"; > reg = <0x2000 0x2000>; > #address-cells = <1>; > #size-cells = <1>; > ranges = <0 0x2000 0x2000>; > -> omap3_pmx_core: pinmux@30 { +> omap3_pmx_core: pinmux at 30 { > compatible = "ti,omap3-padconf", "pinctrl-single"; > reg = <0x30 0x0238>; > #address-cells = <1>; @@ -224,7 +224,7 @@ Yes, I will be looking at this today. > pinctrl-single,function-mask = <0xff1f>; > }; > -> scm_conf: tisyscon@270 { +> scm_conf: tisyscon at 270 { > compatible = "syscon"; > reg = <0x270 0x2f0>; > #address-cells = <1>; @@ -242,7 +242,7 @@ Yes, I will be looking at this today. > }; > }; > -> omap3_pmx_wkup: pinmux@a00 { +> omap3_pmx_wkup: pinmux at a00 { > compatible = "ti,omap3-padconf", "pinctrl-single"; > reg = <0xa00 0x5c>; > #address-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index 0cec55e..bd27c5d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,13 +2,10 @@ "ref\01426689860-17537-31-git-send-email-t-kristo@ti.com\0" "ref\020150318213000.GX31346@atomide.com\0" "ref\020150319202533.GL31346@atomide.com\0" - "From\0Tero Kristo <t-kristo@ti.com>\0" - "Subject\0Re: [PATCHv4 30/35] ARM: dts: omap4: add system control module node\0" + "From\0t-kristo@ti.com (Tero Kristo)\0" + "Subject\0[PATCHv4 30/35] ARM: dts: omap4: add system control module node\0" "Date\0Fri, 20 Mar 2015 08:40:09 +0200\0" - "To\0Tony Lindgren <tony@atomide.com>\0" - "Cc\0linux-omap@vger.kernel.org" - paul@pwsan.com - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 03/19/2015 10:25 PM, Tony Lindgren wrote:\n" @@ -17,7 +14,7 @@ ">>> --- a/arch/arm/boot/dts/omap4.dtsi\n" ">>> +++ b/arch/arm/boot/dts/omap4.dtsi\n" ">>> @@ -167,36 +167,65 @@\n" - ">>> +\t\tscm: scm@4a002000 {\n" + ">>> +\t\tscm: scm at 4a002000 {\n" ">>> +\t\t\tcompatible = \"ti,omap4-ctrl\", \"simple-bus\";\n" ">>> +\t\t\treg = <0x4a002000 0x1000>,\n" ">>> +\t\t\t <0x4a100000 0x1000>;\n" @@ -74,13 +71,13 @@ "> \t\tinterrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,\n" "> \t\t\t <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;\n" ">\n" - "> \t\tl4_cfg: l4@4a000000 {\n" + "> \t\tl4_cfg: l4 at 4a000000 {\n" "> \t\t\tcompatible = \"ti,omap4-l4-cfg\", \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> \t\t\t#size-cells = <1>;\n" "> \t\t\tranges = <0 0x4a000000 0x1000000>;\n" ">\n" - "> \t\t\tcm1: cm1@4000 {\n" + "> \t\t\tcm1: cm1 at 4000 {\n" "> \t\t\t\tcompatible = \"ti,omap4-cm1\";\n" "> \t\t\t\treg = <0x4000 0x2000>;\n" ">\n" @@ -93,7 +90,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> \t\t\tcm2: cm2@8000 {\n" + "> \t\t\tcm2: cm2 at 8000 {\n" "> \t\t\t\tcompatible = \"ti,omap4-cm2\";\n" "> \t\t\t\treg = <0x8000 0x3000>;\n" ">\n" @@ -106,13 +103,13 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> \t\t\tomap4_scm_core: scm@100000 {\n" + "> \t\t\tomap4_scm_core: scm at 100000 {\n" "> \t\t\t\tcompatible = \"ti,omap4-scm-core\", \"simple-bus\";\n" "> \t\t\t\t#address-cells = <1>;\n" "> \t\t\t\t#size-cells = <1>;\n" "> \t\t\t\tranges = <0 0x100000 0x1000>;\n" ">\n" - "> \t\t\t\tomap4_pmx_core: pinmux@40 {\n" + "> \t\t\t\tomap4_pmx_core: pinmux at 40 {\n" "> \t\t\t\t\tcompatible = \"ti,omap4-padconf\", \"pinctrl-single\";\n" "> \t\t\t\t\treg = <0x40 0x0196>;\n" "> \t\t\t\t\t#address-cells = <1>;\n" @@ -123,7 +120,7 @@ "> \t\t\t\t\tpinctrl-single,function-mask = <0x7fff>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tomap4_padconf_global: tisyscon@5a0 {\n" + "> \t\t\t\tomap4_padconf_global: tisyscon at 5a0 {\n" "> \t\t\t\t\tcompatible = \"syscon\";\n" "> \t\t\t\t\treg = <0x5a0 0x170>;\n" "> \t\t\t\t\t#address-cells = <1>;\n" @@ -142,19 +139,19 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" ">\n" - "> \t\t\tl4_wkup: l4@300000 {\n" + "> \t\t\tl4_wkup: l4 at 300000 {\n" "> \t\t\t\tcompatible = \"ti,omap4-l4-wkup\", \"simple-bus\";\n" "> \t\t\t\t#address-cells = <1>;\n" "> \t\t\t\t#size-cells = <1>;\n" "> \t\t\t\tranges = <0 0x300000 0x40000>;\n" ">\n" - "> \t\t\t\tcounter32k: counter@4000 {\n" + "> \t\t\t\tcounter32k: counter at 4000 {\n" "> \t\t\t\t\tcompatible = \"ti,omap-counter32k\";\n" "> \t\t\t\t\treg = <0x4000 0x20>;\n" "> \t\t\t\t\tti,hwmods = \"counter_32k\";\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tprm: prm@6000 {\n" + "> \t\t\t\tprm: prm at 6000 {\n" "> \t\t\t\t\tcompatible = \"ti,omap4-prm\";\n" "> \t\t\t\t\treg = <0x6000 0x3000>;\n" "> \t\t\t\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -168,7 +165,7 @@ "> \t\t\t\t\t};\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tscrm: scrm@a000 {\n" + "> \t\t\t\tscrm: scrm at a000 {\n" "> \t\t\t\t\tcompatible = \"ti,omap4-scrm\";\n" "> \t\t\t\t\treg = <0xa000 0x2000>;\n" "> \t\t\t\t\t#address-cells = <1>;\n" @@ -184,7 +181,7 @@ "> \t\t\t\t\t};\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tomap4_pmx_wkup: pinmux@1e040 {\n" + "> \t\t\t\tomap4_pmx_wkup: pinmux at 1e040 {\n" "> \t\t\t\t\tcompatible = \"ti,omap4-padconf\", \"pinctrl-single\";\n" "> \t\t\t\t\treg = <0x1e040 0x0038>;\n" "> \t\t\t\t\t#address-cells = <1>;\n" @@ -213,20 +210,20 @@ ">\n" "> \t\t...\n" ">\n" - "> \t\tl4_core: l4@48000000 {\n" + "> \t\tl4_core: l4 at 48000000 {\n" "> \t\t\tcompatible = \"ti,omap3-l4-core\", \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> \t\t\t#size-cells = <1>;\n" "> \t\t\tranges = <0 0x48000000 0x1000000>;\n" ">\n" - "> \t\t\tscrm: scrm@48002000 {\n" + "> \t\t\tscrm: scrm at 48002000 {\n" "> \t\t\t\tcompatible = \"ti,omap3-scrm\", \"simple-bus\";\n" "> \t\t\t\treg = <0x2000 0x2000>;\n" "> \t\t\t\t#address-cells = <1>;\n" "> \t\t\t\t#size-cells = <1>;\n" "> \t\t\t\tranges = <0 0x2000 0x2000>;\n" ">\n" - "> \t\t\t\tomap3_pmx_core: pinmux@30 {\n" + "> \t\t\t\tomap3_pmx_core: pinmux at 30 {\n" "> \t\t\t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "> \t\t\t\t\treg = <0x30 0x0238>;\n" "> \t\t\t\t\t#address-cells = <1>;\n" @@ -237,7 +234,7 @@ "> \t\t\t\t\tpinctrl-single,function-mask = <0xff1f>;\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tscm_conf: tisyscon@270 {\n" + "> \t\t\t\tscm_conf: tisyscon at 270 {\n" "> \t\t\t\t\tcompatible = \"syscon\";\n" "> \t\t\t\t\treg = <0x270 0x2f0>;\n" "> \t\t\t\t\t#address-cells = <1>;\n" @@ -255,7 +252,7 @@ "> \t\t\t\t\t};\n" "> \t\t\t\t};\n" ">\n" - "> \t\t\t\tomap3_pmx_wkup: pinmux@a00 {\n" + "> \t\t\t\tomap3_pmx_wkup: pinmux at a00 {\n" "> \t\t\t\t\tcompatible = \"ti,omap3-padconf\", \"pinctrl-single\";\n" "> \t\t\t\t\treg = <0xa00 0x5c>;\n" "> \t\t\t\t\t#address-cells = <1>;\n" @@ -279,4 +276,4 @@ "> \t};\n" > -8810652ca64df80b1faeb375bd365a427a309383d185cff5794f23da1e24d778 +351a0f56ee3699d33e545a49245fc667cf77551e4fcb521dab7d51c85cf331fb
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.