diff for duplicates of <20150318213000.GX31346@atomide.com> diff --git a/a/1.txt b/N1/1.txt index fa81cd2..f3bfdca 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,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>; @@ -32,13 +32,13 @@ Tony ocp { ... - 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>; @@ -51,7 +51,7 @@ Tony }; }; - cm2: cm2@8000 { + cm2: cm2 at 8000 { compatible = "ti,omap4-cm2"; reg = <0x8000 0x3000>; @@ -64,7 +64,7 @@ Tony }; }; - omap4_pmx_core: pinmux@100040 { + omap4_pmx_core: pinmux at 100040 { compatible = "ti,omap4-padconf", "pinctrl-single"; reg = <0x100040 0x0196>; #address-cells = <1>; @@ -75,7 +75,7 @@ Tony pinctrl-single,function-mask = <0x7fff>; }; - omap4_padconf_global: tisyscon@1005a0 { + omap4_padconf_global: tisyscon at 1005a0 { compatible = "syscon"; reg = <0x1005a0 0x170>; #address-cells = <1>; @@ -94,19 +94,19 @@ Tony }; }; - l4_wkup: l4@4a300000 { + l4_wkup: l4 at 4a300000 { compatible = "ti,omap4-l4-wkup", "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges = <0 0x4a300000 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>; @@ -120,7 +120,7 @@ Tony }; }; - scrm: scrm@a000 { + scrm: scrm at a000 { compatible = "ti,omap4-scrm"; reg = <0xa000 0x2000>; #address-cells = <1>; @@ -136,7 +136,7 @@ Tony }; }; - omap4_pmx_wkup: pinmux@1e040 { + omap4_pmx_wkup: pinmux at 1e040 { compatible = "ti,omap4-padconf", "pinctrl-single"; reg = <0x1e040 0x0038>; #address-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index aeb35be..510f773 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,16 @@ "ref\01426689860-17537-1-git-send-email-t-kristo@ti.com\0" "ref\01426689860-17537-31-git-send-email-t-kristo@ti.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\0Wed, 18 Mar 2015 14:30:01 -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" "* Tero Kristo <t-kristo@ti.com> [150318 07:45]:\n" "> --- 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" @@ -43,13 +40,13 @@ "\tocp {\n" "\t\t...\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" @@ -62,7 +59,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" @@ -75,7 +72,7 @@ "\t\t\t\t};\n" "\t\t\t};\n" "\n" - "\t\t\tomap4_pmx_core: pinmux@100040 {\n" + "\t\t\tomap4_pmx_core: pinmux at 100040 {\n" "\t\t\t\tcompatible = \"ti,omap4-padconf\", \"pinctrl-single\";\n" "\t\t\t\treg = <0x100040 0x0196>;\n" "\t\t\t\t#address-cells = <1>;\n" @@ -86,7 +83,7 @@ "\t\t\t\tpinctrl-single,function-mask = <0x7fff>;\n" "\t\t\t};\n" "\n" - "\t\t\tomap4_padconf_global: tisyscon@1005a0 {\n" + "\t\t\tomap4_padconf_global: tisyscon at 1005a0 {\n" "\t\t\t\tcompatible = \"syscon\";\n" "\t\t\t\treg = <0x1005a0 0x170>;\n" "\t\t\t\t#address-cells = <1>;\n" @@ -105,19 +102,19 @@ "\t\t\t};\n" "\t\t};\n" "\n" - "\t\tl4_wkup: l4@4a300000 {\n" + "\t\tl4_wkup: l4 at 4a300000 {\n" "\t\t\tcompatible = \"ti,omap4-l4-wkup\", \"simple-bus\";\n" "\t\t\t#address-cells = <1>;\n" "\t\t\t#size-cells = <1>;\n" "\t\t\tranges = <0 0x4a300000 0x40000>;\n" "\n" - "\t\t\tcounter32k: counter@4000 {\n" + "\t\t\tcounter32k: counter at 4000 {\n" "\t\t\t\tcompatible = \"ti,omap-counter32k\";\n" "\t\t\t\treg = <0x4000 0x20>;\n" "\t\t\t\tti,hwmods = \"counter_32k\";\n" "\t\t\t};\n" "\n" - "\t\t\tprm: prm@6000 {\n" + "\t\t\tprm: prm at 6000 {\n" "\t\t\t\tcompatible = \"ti,omap4-prm\";\n" "\t\t\t\treg = <0x6000 0x3000>;\n" "\t\t\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -131,7 +128,7 @@ "\t\t\t\t};\n" "\t\t\t};\n" "\n" - "\t\t\tscrm: scrm@a000 {\n" + "\t\t\tscrm: scrm at a000 {\n" "\t\t\t\tcompatible = \"ti,omap4-scrm\";\n" "\t\t\t\treg = <0xa000 0x2000>;\n" "\t\t\t\t#address-cells = <1>;\n" @@ -147,7 +144,7 @@ "\t\t\t\t};\n" "\t\t\t};\n" "\n" - "\t\t\tomap4_pmx_wkup: pinmux@1e040 {\n" + "\t\t\tomap4_pmx_wkup: pinmux at 1e040 {\n" "\t\t\t\tcompatible = \"ti,omap4-padconf\", \"pinctrl-single\";\n" "\t\t\t\treg = <0x1e040 0x0038>;\n" "\t\t\t\t#address-cells = <1>;\n" @@ -161,4 +158,4 @@ "\t\t...\n" "\t};" -b5a3c32606d5c439928b8ce125ecf7501d77a2169ba0e411542e3395b74878f1 +a1f6b6100b4f96798a63d0ce6c01a4ade91ac0958d681617a5152bf008888baa
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.