diff for duplicates of <53231829.3060602@ti.com> diff --git a/a/1.txt b/N1/1.txt index 766c9ea..6e4ec98 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,26 +26,26 @@ On Friday 14 March 2014 05:41 PM, Roger Quadros 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>; @@ -53,7 +53,7 @@ On Friday 14 March 2014 05:41 PM, Roger Quadros 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>; @@ -64,7 +64,7 @@ On Friday 14 March 2014 05:41 PM, Roger Quadros 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>; @@ -75,7 +75,7 @@ On Friday 14 March 2014 05:41 PM, Roger Quadros 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 10dc95c..4358df6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,18 +2,10 @@ "ref\01394197751-28984-8-git-send-email-rogerq@ti.com\0" "ref\05322DC0E.1020600@ti.com\0" "ref\05322F20C.50600@ti.com\0" - "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" - "Subject\0Re: [PATCH 7/8] ARM: dts: dra7: Add USB related nodes\0" + "From\0kishon@ti.com (Kishon Vijay Abraham I)\0" + "Subject\0[PATCH 7/8] ARM: dts: dra7: Add USB related nodes\0" "Date\0Fri, 14 Mar 2014 20:24:33 +0530\0" - "To\0Roger Quadros <rogerq@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" "\n" @@ -44,26 +36,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" @@ -71,7 +63,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" @@ -82,7 +74,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" @@ -93,7 +85,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" @@ -123,4 +115,4 @@ "Cheers\n" Kishon -73e275a9023170004d38408696deeb3973588afe7568d467481c159667ae113b +fa904b22cc41e87caaec25b169097dbd65dc39573fc3467d70525df3bcdfa184
diff --git a/a/content_digest b/N2/content_digest index 10dc95c..94c537f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,14 +6,14 @@ "Subject\0Re: [PATCH 7/8] ARM: dts: dra7: Add USB related nodes\0" "Date\0Fri, 14 Mar 2014 20:24:33 +0530\0" "To\0Roger Quadros <rogerq@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" "\n" @@ -123,4 +123,4 @@ "Cheers\n" Kishon -73e275a9023170004d38408696deeb3973588afe7568d467481c159667ae113b +0e33a4ce5d5eda2eb3804b28a7820674916830b3aa3b2121ca76a73786e9423e
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.