diff for duplicates of <5322DC0E.1020600@ti.com> diff --git a/a/1.txt b/N1/1.txt index 8aed82c..9b11ca4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,26 +22,26 @@ On Friday 07 March 2014 06:39 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>; @@ -49,7 +49,7 @@ On Friday 07 March 2014 06:39 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>; @@ -60,7 +60,7 @@ On Friday 07 March 2014 06:39 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>; @@ -71,7 +71,7 @@ On Friday 07 March 2014 06:39 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 e12dc20..877c6b0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,9 @@ "ref\01394197751-28984-1-git-send-email-rogerq@ti.com\0" "ref\01394197751-28984-8-git-send-email-rogerq@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 16:08:06 +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" "Hi Roger,\n" @@ -38,26 +30,26 @@ "> \t\t\tti,hwmods = \"sata\";\n" "> \t\t};\n" "> +\n" - "> +\t\tomap_control_usb2phy1: control-phy@4a002300 {\n" + "> +\t\tomap_control_usb2phy1: control-phy at 4a002300 {\n" "> +\t\t\tcompatible = \"ti,control-phy-usb2\";\n" "> +\t\t\treg = <0x4a002300 0x4>;\n" "> +\t\t\treg-names = \"power\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tomap_control_usb3phy1: control-phy@4a002370 {\n" + "> +\t\tomap_control_usb3phy1: control-phy at 4a002370 {\n" "> +\t\t\tcompatible = \"ti,control-phy-pipe3\";\n" "> +\t\t\treg = <0x4a002370 0x4>;\n" "> +\t\t\treg-names = \"power\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tomap_control_usb2phy2: control-phy@0x4a002e74 {\n" + "> +\t\tomap_control_usb2phy2: control-phy at 0x4a002e74 {\n" "> +\t\t\tcompatible = \"ti,control-phy-usb2-dra7\";\n" "> +\t\t\treg = <0x4a002e74 0x4>;\n" "> +\t\t\treg-names = \"power\";\n" "> +\t\t};\n" "> +\n" "> +\t\t/* OCP2SCP1 */\n" - "> +\t\tocp2scp@4a080000 {\n" + "> +\t\tocp2scp at 4a080000 {\n" "> +\t\t\tcompatible = \"ti,omap-ocp2scp\";\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" @@ -65,7 +57,7 @@ "> +\t\t\treg = <0x4a080000 0x20>;\n" "> +\t\t\tti,hwmods = \"ocp2scp1\";\n" "> +\n" - "> +\t\t\tusb2_phy1: phy@4a084000 {\n" + "> +\t\t\tusb2_phy1: phy at 4a084000 {\n" "> +\t\t\t\tcompatible = \"ti,omap-usb2\";\n" "> +\t\t\t\treg = <0x4a084000 0x400>;\n" "> +\t\t\t\tctrl-module = <&omap_control_usb2phy1>;\n" @@ -76,7 +68,7 @@ "> +\t\t\t\t#phy-cells = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusb2_phy2: phy@4a085000 {\n" + "> +\t\t\tusb2_phy2: phy at 4a085000 {\n" "> +\t\t\t\tcompatible = \"ti,omap-usb2\";\n" "> +\t\t\t\treg = <0x4a085000 0x400>;\n" "> +\t\t\t\tctrl-module = <&omap_control_usb2phy2>;\n" @@ -87,7 +79,7 @@ "> +\t\t\t\t#phy-cells = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusb3_phy1: phy@4a084400 {\n" + "> +\t\t\tusb3_phy1: phy at 4a084400 {\n" "> +\t\t\t\tcompatible = \"ti,omap-usb3\";\n" "> +\t\t\t\treg = <0x4a084400 0x80>,\n" "> +\t\t\t\t <0x4a084800 0x64>,\n" @@ -107,4 +99,4 @@ "\n" -Kishon -c030dac0e9c17e8bee051e3d3a37d88d2e6771af0dfbae5e978a5c2c5b934fe2 +b96c5f9280e1d122486e4516e75ae3a2dfa5fcda291c2c0e544504266bdd0d29
diff --git a/a/content_digest b/N2/content_digest index e12dc20..553d260 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,14 +4,14 @@ "Subject\0Re: [PATCH 7/8] ARM: dts: dra7: Add USB related nodes\0" "Date\0Fri, 14 Mar 2014 16:08:06 +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" "Hi Roger,\n" @@ -107,4 +107,4 @@ "\n" -Kishon -c030dac0e9c17e8bee051e3d3a37d88d2e6771af0dfbae5e978a5c2c5b934fe2 +27e7ff27633fa9d389d2eac06af35c9b94a58c0cb4ccaa62fa727a7f4dbe8540
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.