diff for duplicates of <55009E23.2020805@ti.com> diff --git a/a/1.txt b/N1/1.txt index 0c6806c..ff905fe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ On 03/11/2015 09:26 PM, Tony Lindgren wrote: >>>> }; >>>> }; >>>> ->>>> + scm: scm@4a002000 { +>>>> + scm: scm at 4a002000 { >>>> + compatible = "ti,dra7-ctrl", "simple-bus"; >>>> + reg = <0x4a002000 0x1400>, >>>> + <0x4a003400 0x600>, @@ -26,14 +26,14 @@ On 03/11/2015 09:26 PM, Tony Lindgren wrote: >>>> + <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 5a2a9b7..6ded84f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,13 +3,10 @@ "ref\020150311171708.GB5264@atomide.com\0" "ref\0550092CA.9030008@ti.com\0" "ref\020150311192621.GE5264@atomide.com\0" - "From\0Tero Kristo <t-kristo@ti.com>\0" - "Subject\0Re: [PATCHv3 34/35] ARM: dts: dra7: add system control module node\0" + "From\0t-kristo@ti.com (Tero Kristo)\0" + "Subject\0[PATCHv3 34/35] ARM: dts: dra7: add system control module node\0" "Date\0Wed, 11 Mar 2015 21:57:23 +0200\0" - "To\0Tony Lindgren <tony@atomide.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" "On 03/11/2015 09:26 PM, Tony Lindgren wrote:\n" @@ -29,7 +26,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" @@ -40,14 +37,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" @@ -100,4 +97,4 @@ "\n" -Tero -d22c00c9e3ecaa472e269f56ab3339a2a31f08077c3f41a2d6332427fa244925 +57dd564de7ca5377854622e0cfc92224057c18e3995a8d17934c1c62e069aaa5
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.