diff for duplicates of <53232185.6090305@ti.com> diff --git a/a/1.txt b/N1/1.txt index 8021d2e..718efda 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,26 +27,26 @@ On 03/14/2014 04:54 PM, Kishon Vijay Abraham I wrote: >>>> ti,hwmods = "sata"; >>>> }; >>>> + ->>>> + omap_control_usb2phy1: control-phy@4a002300 { +>>>> + omap_control_usb2phy1: control-phy at 4a002300 { >>>> + compatible = "ti,control-phy-usb2"; >>>> + reg = <0x4a002300 0x4>; >>>> + reg-names = "power"; >>>> + }; >>>> + ->>>> + omap_control_usb3phy1: control-phy@4a002370 { +>>>> + omap_control_usb3phy1: control-phy at 4a002370 { >>>> + compatible = "ti,control-phy-pipe3"; >>>> + reg = <0x4a002370 0x4>; >>>> + reg-names = "power"; >>>> + }; >>>> + ->>>> + omap_control_usb2phy2: control-phy@0x4a002e74 { +>>>> + omap_control_usb2phy2: control-phy at 0x4a002e74 { >>>> + compatible = "ti,control-phy-usb2-dra7"; >>>> + reg = <0x4a002e74 0x4>; >>>> + reg-names = "power"; >>>> + }; >>>> + >>>> + /* OCP2SCP1 */ ->>>> + ocp2scp@4a080000 { +>>>> + ocp2scp at 4a080000 { >>>> + compatible = "ti,omap-ocp2scp"; >>>> + #address-cells = <1>; >>>> + #size-cells = <1>; @@ -54,7 +54,7 @@ On 03/14/2014 04:54 PM, Kishon Vijay Abraham I wrote: >>>> + reg = <0x4a080000 0x20>; >>>> + ti,hwmods = "ocp2scp1"; >>>> + ->>>> + usb2_phy1: phy@4a084000 { +>>>> + usb2_phy1: phy at 4a084000 { >>>> + compatible = "ti,omap-usb2"; >>>> + reg = <0x4a084000 0x400>; >>>> + ctrl-module = <&omap_control_usb2phy1>; @@ -65,7 +65,7 @@ On 03/14/2014 04:54 PM, Kishon Vijay Abraham I wrote: >>>> + #phy-cells = <0>; >>>> + }; >>>> + ->>>> + usb2_phy2: phy@4a085000 { +>>>> + usb2_phy2: phy at 4a085000 { >>>> + compatible = "ti,omap-usb2"; >>>> + reg = <0x4a085000 0x400>; >>>> + ctrl-module = <&omap_control_usb2phy2>; @@ -76,7 +76,7 @@ On 03/14/2014 04:54 PM, Kishon Vijay Abraham I wrote: >>>> + #phy-cells = <0>; >>>> + }; >>>> + ->>>> + usb3_phy1: phy@4a084400 { +>>>> + usb3_phy1: phy at 4a084400 { >>>> + compatible = "ti,omap-usb3"; >>>> + reg = <0x4a084400 0x80>, >>>> + <0x4a084800 0x64>, diff --git a/a/content_digest b/N1/content_digest index 252fa24..3ef118d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,18 +3,10 @@ "ref\05322DC0E.1020600@ti.com\0" "ref\05322F20C.50600@ti.com\0" "ref\053231829.3060602@ti.com\0" - "From\0Roger Quadros <rogerq@ti.com>\0" - "Subject\0Re: [PATCH 7/8] ARM: dts: dra7: Add USB related nodes\0" + "From\0rogerq@ti.com (Roger Quadros)\0" + "Subject\0[PATCH 7/8] ARM: dts: dra7: Add USB related nodes\0" "Date\0Fri, 14 Mar 2014 17:34:29 +0200\0" - "To\0Kishon Vijay Abraham I <kishon@ti.com>" - balbi@ti.com - " tony@atomide.com\0" - "Cc\0devicetree@vger.kernel.org" - george.cherian@ti.com - linux-usb@vger.kernel.org - linux-kernel@vger.kernel.org - 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/14/2014 04:54 PM, Kishon Vijay Abraham I wrote:\n" @@ -46,26 +38,26 @@ ">>>> ti,hwmods = \"sata\";\n" ">>>> };\n" ">>>> +\n" - ">>>> + omap_control_usb2phy1: control-phy@4a002300 {\n" + ">>>> + omap_control_usb2phy1: control-phy at 4a002300 {\n" ">>>> + compatible = \"ti,control-phy-usb2\";\n" ">>>> + reg = <0x4a002300 0x4>;\n" ">>>> + reg-names = \"power\";\n" ">>>> + };\n" ">>>> +\n" - ">>>> + omap_control_usb3phy1: control-phy@4a002370 {\n" + ">>>> + omap_control_usb3phy1: control-phy at 4a002370 {\n" ">>>> + compatible = \"ti,control-phy-pipe3\";\n" ">>>> + reg = <0x4a002370 0x4>;\n" ">>>> + reg-names = \"power\";\n" ">>>> + };\n" ">>>> +\n" - ">>>> + omap_control_usb2phy2: control-phy@0x4a002e74 {\n" + ">>>> + omap_control_usb2phy2: control-phy at 0x4a002e74 {\n" ">>>> + compatible = \"ti,control-phy-usb2-dra7\";\n" ">>>> + reg = <0x4a002e74 0x4>;\n" ">>>> + reg-names = \"power\";\n" ">>>> + };\n" ">>>> +\n" ">>>> + /* OCP2SCP1 */\n" - ">>>> + ocp2scp@4a080000 {\n" + ">>>> + ocp2scp at 4a080000 {\n" ">>>> + compatible = \"ti,omap-ocp2scp\";\n" ">>>> + #address-cells = <1>;\n" ">>>> + #size-cells = <1>;\n" @@ -73,7 +65,7 @@ ">>>> + reg = <0x4a080000 0x20>;\n" ">>>> + ti,hwmods = \"ocp2scp1\";\n" ">>>> +\n" - ">>>> + usb2_phy1: phy@4a084000 {\n" + ">>>> + usb2_phy1: phy at 4a084000 {\n" ">>>> + compatible = \"ti,omap-usb2\";\n" ">>>> + reg = <0x4a084000 0x400>;\n" ">>>> + ctrl-module = <&omap_control_usb2phy1>;\n" @@ -84,7 +76,7 @@ ">>>> + #phy-cells = <0>;\n" ">>>> + };\n" ">>>> +\n" - ">>>> + usb2_phy2: phy@4a085000 {\n" + ">>>> + usb2_phy2: phy at 4a085000 {\n" ">>>> + compatible = \"ti,omap-usb2\";\n" ">>>> + reg = <0x4a085000 0x400>;\n" ">>>> + ctrl-module = <&omap_control_usb2phy2>;\n" @@ -95,7 +87,7 @@ ">>>> + #phy-cells = <0>;\n" ">>>> + };\n" ">>>> +\n" - ">>>> + usb3_phy1: phy@4a084400 {\n" + ">>>> + usb3_phy1: phy at 4a084400 {\n" ">>>> + compatible = \"ti,omap-usb3\";\n" ">>>> + reg = <0x4a084400 0x80>,\n" ">>>> + <0x4a084800 0x64>,\n" @@ -127,4 +119,4 @@ "cheers,\n" -roger -cfe68cb6aef7652a89832fdbca773b316325cbc7136ba7f188bea0c688d027c8 +8dc4b3413698f940d52a4920a2b5c6924bc97f703157c5218a40bde4c6ff4e8e
diff --git a/a/content_digest b/N2/content_digest index 252fa24..e6ffef3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,14 +7,14 @@ "Subject\0Re: [PATCH 7/8] ARM: dts: dra7: Add USB related nodes\0" "Date\0Fri, 14 Mar 2014 17:34:29 +0200\0" "To\0Kishon Vijay Abraham I <kishon@ti.com>" - balbi@ti.com - " tony@atomide.com\0" - "Cc\0devicetree@vger.kernel.org" - george.cherian@ti.com - linux-usb@vger.kernel.org - linux-kernel@vger.kernel.org - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + <balbi@ti.com> + " <tony@atomide.com>\0" + "Cc\0<george.cherian@ti.com>" + <linux-omap@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + <devicetree@vger.kernel.org> + " <linux-usb@vger.kernel.org>\0" "\00:1\0" "b\0" "On 03/14/2014 04:54 PM, Kishon Vijay Abraham I wrote:\n" @@ -127,4 +127,4 @@ "cheers,\n" -roger -cfe68cb6aef7652a89832fdbca773b316325cbc7136ba7f188bea0c688d027c8 +d7d48acc630510674bc3597d78564e50bdaf1083d6409fc04f75239b80e16923
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.