diff for duplicates of <20150311210007.GG5264@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 3b8eaec..a065158 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,7 @@ > >>>> }; > >>>> }; > >>>> -> >>>>+ scm: scm@4a002000 { +> >>>>+ scm: scm at 4a002000 { > >>>>+ compatible = "ti,dra7-ctrl", "simple-bus"; > >>>>+ reg = <0x4a002000 0x1400>, > >>>>+ <0x4a003400 0x600>, @@ -27,14 +27,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 0da0405..569c942 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,13 +4,10 @@ "ref\0550092CA.9030008@ti.com\0" "ref\020150311192621.GE5264@atomide.com\0" "ref\055009E23.2020805@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 14:00:07 -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:57]:\n" @@ -31,7 +28,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" @@ -42,14 +39,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" @@ -104,4 +101,4 @@ "\n" Tony -d950326fc254405b74bdd2a61343cc67c6fabb46768fd2851575832115508269 +6775cbd78fec468a4dd3dd5aea54aad9a2496f78095a5e303f4d632dfc29190d
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.