diff for duplicates of <20150319202533.GL31346@atomide.com> diff --git a/a/1.txt b/N1/1.txt index de77395..ccf017a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ > > --- 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>; @@ -55,13 +55,13 @@ Example for omap4.dtsi, which ocp being the l3 interconnect: 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>; @@ -74,7 +74,7 @@ Example for omap4.dtsi, which ocp being the l3 interconnect: }; }; - cm2: cm2@8000 { + cm2: cm2 at 8000 { compatible = "ti,omap4-cm2"; reg = <0x8000 0x3000>; @@ -87,13 +87,13 @@ Example for omap4.dtsi, which ocp being the l3 interconnect: }; }; - 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>; @@ -104,7 +104,7 @@ Example for omap4.dtsi, which ocp being the l3 interconnect: pinctrl-single,function-mask = <0x7fff>; }; - omap4_padconf_global: tisyscon@5a0 { + omap4_padconf_global: tisyscon at 5a0 { compatible = "syscon"; reg = <0x5a0 0x170>; #address-cells = <1>; @@ -123,19 +123,19 @@ Example for omap4.dtsi, which ocp being the l3 interconnect: }; }; - 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>; @@ -149,7 +149,7 @@ Example for omap4.dtsi, which ocp being the l3 interconnect: }; }; - scrm: scrm@a000 { + scrm: scrm at a000 { compatible = "ti,omap4-scrm"; reg = <0xa000 0x2000>; #address-cells = <1>; @@ -165,7 +165,7 @@ Example for omap4.dtsi, which ocp being the l3 interconnect: }; }; - omap4_pmx_wkup: pinmux@1e040 { + omap4_pmx_wkup: pinmux at 1e040 { compatible = "ti,omap4-padconf", "pinctrl-single"; reg = <0x1e040 0x0038>; #address-cells = <1>; @@ -194,20 +194,20 @@ Example for omap3.dtsi with ocp being the l3 interconnect: ... - 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>; @@ -218,7 +218,7 @@ Example for omap3.dtsi with ocp being the l3 interconnect: pinctrl-single,function-mask = <0xff1f>; }; - scm_conf: tisyscon@270 { + scm_conf: tisyscon at 270 { compatible = "syscon"; reg = <0x270 0x2f0>; #address-cells = <1>; @@ -236,7 +236,7 @@ Example for omap3.dtsi with ocp being the l3 interconnect: }; }; - 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 ac6c10b..7cda6a9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,10 @@ "ref\01426689860-17537-1-git-send-email-t-kristo@ti.com\0" "ref\01426689860-17537-31-git-send-email-t-kristo@ti.com\0" "ref\020150318213000.GX31346@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCHv4 30/35] ARM: dts: omap4: add system control module node\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCHv4 30/35] ARM: dts: omap4: add system control module node\0" "Date\0Thu, 19 Mar 2015 13:25:34 -0700\0" - "To\0Tero Kristo <t-kristo@ti.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" "* Tony Lindgren <tony@atomide.com> [150318 14:35]:\n" @@ -15,7 +12,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" @@ -67,13 +64,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" @@ -86,7 +83,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" @@ -99,13 +96,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" @@ -116,7 +113,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" @@ -135,19 +132,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" @@ -161,7 +158,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" @@ -177,7 +174,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" @@ -206,20 +203,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" @@ -230,7 +227,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" @@ -248,7 +245,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" @@ -271,4 +268,4 @@ "\t\t...\n" "\t};" -97a65d95dde1d9efd11cef197c1ff074a98dc59531711d889df80ea04b2f92fb +cef87612b195ddf789ac6979ca5861347089819f4f8cdf13c84125b046e39f86
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.