diff for duplicates of <20150311192621.GE5264@atomide.com> diff --git a/a/1.txt b/N1/1.txt index ab5e9d3..0a9b5d9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ > >> }; > >> }; > >> -> >>+ scm: scm@4a002000 { +> >>+ scm: scm at 4a002000 { > >>+ compatible = "ti,dra7-ctrl", "simple-bus"; > >>+ reg = <0x4a002000 0x1400>, > >>+ <0x4a003400 0x600>, @@ -25,14 +25,14 @@ > >>+ <1 0 0x4a003400 0x600>, > >>+ <2 0 0x4ae0c000 0x600>; > >>+ -> >>+ scm_conf: tisyscon@0,0 { +> >>+ scm_conf: tisyscon at 0,0 { > >>+ compatible = "syscon"; > >>+ reg = <0 0x0 0x1400>; > >>+ #address-cells = <1>; > >>+ #size-cells = <1>; > >>+ }; > >>+ -> >>+ dra7_pmx_core: pinmux@1,0 { +> >>+ dra7_pmx_core: pinmux at 1,0 { > >>+ compatible = "ti,dra7-padconf", > >>+ "pinctrl-single"; > >>+ reg = <1 0x0 0x0464>; diff --git a/a/content_digest b/N1/content_digest index 4109d47..77f0fb5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,13 +2,10 @@ "ref\01424891085-10392-35-git-send-email-t-kristo@ti.com\0" "ref\020150311171708.GB5264@atomide.com\0" "ref\0550092CA.9030008@ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCHv3 34/35] ARM: dts: dra7: add system control module node\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCHv3 34/35] ARM: dts: dra7: add system control module node\0" "Date\0Wed, 11 Mar 2015 12:26:22 -0700\0" - "To\0Tero Kristo <t-kristo@ti.com>\0" - "Cc\0paul@pwsan.com" - linux-omap@vger.kernel.org - " 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> [150311 12:09]:\n" @@ -27,7 +24,7 @@ "> >> \t\t\t};\n" "> >> \t\t};\n" "> >>\n" - "> >>+\t\tscm: scm@4a002000 {\n" + "> >>+\t\tscm: scm at 4a002000 {\n" "> >>+\t\t\tcompatible = \"ti,dra7-ctrl\", \"simple-bus\";\n" "> >>+\t\t\treg = <0x4a002000 0x1400>,\n" "> >>+\t\t\t <0x4a003400 0x600>,\n" @@ -38,14 +35,14 @@ "> >>+\t\t\t\t <1 0 0x4a003400 0x600>,\n" "> >>+\t\t\t\t <2 0 0x4ae0c000 0x600>;\n" "> >>+\n" - "> >>+\t\t\tscm_conf: tisyscon@0,0 {\n" + "> >>+\t\t\tscm_conf: tisyscon at 0,0 {\n" "> >>+\t\t\t\tcompatible = \"syscon\";\n" "> >>+\t\t\t\treg = <0 0x0 0x1400>;\n" "> >>+\t\t\t\t#address-cells = <1>;\n" "> >>+\t\t\t\t#size-cells = <1>;\n" "> >>+\t\t\t};\n" "> >>+\n" - "> >>+\t\t\tdra7_pmx_core: pinmux@1,0 {\n" + "> >>+\t\t\tdra7_pmx_core: pinmux at 1,0 {\n" "> >>+\t\t\t\tcompatible = \"ti,dra7-padconf\",\n" "> >>+\t\t\t\t\t \"pinctrl-single\";\n" "> >>+\t\t\t\treg = <1 0x0 0x0464>;\n" @@ -93,4 +90,4 @@ "\n" Tony -0cd0f36d5bc21183893ef8d5d4f165caeca0f288a2a10d83604883e787cc371a +86a7e3d9a7bbe639cda2ab0a9d65df8147f0f0e7d5e164486a52188b706db334
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.