diff for duplicates of <20150311171708.GB5264@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 308073b..0d100fe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ Hi Tero, > }; > }; > -> + scm: scm@4a002000 { +> + scm: scm at 4a002000 { > + compatible = "ti,dra7-ctrl", "simple-bus"; > + reg = <0x4a002000 0x1400>, > + <0x4a003400 0x600>, @@ -23,14 +23,14 @@ Hi Tero, > + <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 9566d71..c1eb609 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,9 @@ "ref\01424891085-10392-1-git-send-email-t-kristo@ti.com\0" "ref\01424891085-10392-35-git-send-email-t-kristo@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 10:17:08 -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" "Hi Tero,\n" @@ -23,7 +20,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" @@ -34,14 +31,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" @@ -63,4 +60,4 @@ "\n" Tony -58cf59e3845f63fa8159e005712e56af85cbedad5278eeb40ada54b416f10d37 +782531fdf8c3f8ac91c95aa3705024846cbc834e78e7d523bfd7daf9eb2ade6c
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.