diff for duplicates of <5211C84A.5040000@ti.com> diff --git a/a/1.txt b/N1/1.txt index 7aafdb7..1c365d1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,7 @@ OK. >> --- a/arch/arm/boot/dts/omap4.dtsi >> +++ b/arch/arm/boot/dts/omap4.dtsi >> @@ -519,7 +519,7 @@ ->> usb2_phy: usb2phy@4a0ad080 { +>> usb2_phy: usb2phy at 4a0ad080 { >> compatible = "ti,omap-usb2"; >> reg = <0x4a0ad080 0x58>; >> - ctrl-module = <&omap_control_usb>; @@ -38,25 +38,25 @@ OK. >> }; >> }; >> ->> - omap_control_usb: omap-control-usb@4a002300 { +>> - omap_control_usb: omap-control-usb at 4a002300 { >> - compatible = "ti,omap-control-usb"; >> - reg = <0x4a002300 0x4>, >> - <0x4a00233c 0x4>; >> - reg-names = "control_dev_conf", "otghs_control"; >> - ti,type = <1>; ->> + omap_control_usb2phy: omap-control-usb@4a002300 { +>> + omap_control_usb2phy: omap-control-usb at 4a002300 { >> + compatible = "ti,usb2-control-usb"; >> + reg = <0x4a002300 0x4>; >> + reg-names = "power"; >> + }; >> + ->> + omap_control_usbotg: omap-control-usb@4a00233c { +>> + omap_control_usbotg: omap-control-usb at 4a00233c { >> + compatible = "ti,omap4-control-usb"; >> + reg = <0x4a00233c 0x4>; >> + reg-names = "otghs_control"; >> }; >> ->> usb_otg_hs: usb_otg_hs@4a0ab000 { +>> usb_otg_hs: usb_otg_hs at 4a0ab000 { >> @@ -661,7 +665,7 @@ >> multipoint = <1>; >> num-eps = <16>; diff --git a/a/content_digest b/N1/content_digest index 5642e7e..80465dc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,10 @@ "ref\01376658571-20992-1-git-send-email-rogerq@ti.com\0" "ref\01376658571-20992-8-git-send-email-rogerq@ti.com\0" "ref\0520E379B.4090108@baylibre.com\0" - "From\0Roger Quadros <rogerq@ti.com>\0" - "Subject\0Re: [PATCH v3 7/8] ARM: dts: omap4: update omap-control-usb nodes\0" + "From\0rogerq@ti.com (Roger Quadros)\0" + "Subject\0[PATCH v3 7/8] ARM: dts: omap4: update omap-control-usb nodes\0" "Date\0Mon, 19 Aug 2013 10:24:58 +0300\0" - "To\0Benoit Cousson <bcousson@baylibre.com>\0" - "Cc\0balbi@ti.com" - tony@atomide.com - george.cherian@ti.com - kishon@ti.com - bigeasy@linutronix.de - linux-usb@vger.kernel.org - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Benoit,\n" @@ -44,7 +35,7 @@ ">> --- a/arch/arm/boot/dts/omap4.dtsi\n" ">> +++ b/arch/arm/boot/dts/omap4.dtsi\n" ">> @@ -519,7 +519,7 @@\n" - ">> usb2_phy: usb2phy@4a0ad080 {\n" + ">> usb2_phy: usb2phy at 4a0ad080 {\n" ">> compatible = \"ti,omap-usb2\";\n" ">> reg = <0x4a0ad080 0x58>;\n" ">> - ctrl-module = <&omap_control_usb>;\n" @@ -56,25 +47,25 @@ ">> };\n" ">> };\n" ">>\n" - ">> - omap_control_usb: omap-control-usb@4a002300 {\n" + ">> - omap_control_usb: omap-control-usb at 4a002300 {\n" ">> - compatible = \"ti,omap-control-usb\";\n" ">> - reg = <0x4a002300 0x4>,\n" ">> - <0x4a00233c 0x4>;\n" ">> - reg-names = \"control_dev_conf\", \"otghs_control\";\n" ">> - ti,type = <1>;\n" - ">> + omap_control_usb2phy: omap-control-usb@4a002300 {\n" + ">> + omap_control_usb2phy: omap-control-usb at 4a002300 {\n" ">> + compatible = \"ti,usb2-control-usb\";\n" ">> + reg = <0x4a002300 0x4>;\n" ">> + reg-names = \"power\";\n" ">> + };\n" ">> +\n" - ">> + omap_control_usbotg: omap-control-usb@4a00233c {\n" + ">> + omap_control_usbotg: omap-control-usb at 4a00233c {\n" ">> + compatible = \"ti,omap4-control-usb\";\n" ">> + reg = <0x4a00233c 0x4>;\n" ">> + reg-names = \"otghs_control\";\n" ">> };\n" ">>\n" - ">> usb_otg_hs: usb_otg_hs@4a0ab000 {\n" + ">> usb_otg_hs: usb_otg_hs at 4a0ab000 {\n" ">> @@ -661,7 +665,7 @@\n" ">> multipoint = <1>;\n" ">> num-eps = <16>;\n" @@ -97,4 +88,4 @@ "cheers,\n" -roger -5cf3173f063ab43b37ca2f11cd8750b22fe711f2922f9964fd3515e71d237018 +e9d098e5d3efc60b2ea2c9602cbc8be83824dd8ce86c2615f44ca45e0908f498
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.