diff for duplicates of <520E379B.4090108@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 7892b71..5bb9fb6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ You should add that you update the usb_otg_hs node accordingly as well. > --- 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>; @@ -31,25 +31,25 @@ You should add that you update the usb_otg_hs node accordingly as well. > }; > }; > -> - 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 b9f7207..8cc9369 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,9 @@ "ref\01376658571-20992-1-git-send-email-rogerq@ti.com\0" "ref\01376658571-20992-8-git-send-email-rogerq@ti.com\0" - "From\0Benoit Cousson <bcousson@baylibre.com>\0" - "Subject\0Re: [PATCH v3 7/8] ARM: dts: omap4: update omap-control-usb nodes\0" + "From\0bcousson@baylibre.com (Benoit Cousson)\0" + "Subject\0[PATCH v3 7/8] ARM: dts: omap4: update omap-control-usb nodes\0" "Date\0Fri, 16 Aug 2013 16:30:51 +0200\0" - "To\0Roger Quadros <rogerq@ti.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 Roger,\n" @@ -36,7 +27,7 @@ "> --- a/arch/arm/boot/dts/omap4.dtsi\n" "> +++ b/arch/arm/boot/dts/omap4.dtsi\n" "> @@ -519,7 +519,7 @@\n" - "> \t\t\tusb2_phy: usb2phy@4a0ad080 {\n" + "> \t\t\tusb2_phy: usb2phy at 4a0ad080 {\n" "> \t\t\t\tcompatible = \"ti,omap-usb2\";\n" "> \t\t\t\treg = <0x4a0ad080 0x58>;\n" "> -\t\t\t\tctrl-module = <&omap_control_usb>;\n" @@ -48,25 +39,25 @@ "> \t\t\t};\n" "> \t\t};\n" ">\n" - "> -\t\tomap_control_usb: omap-control-usb@4a002300 {\n" + "> -\t\tomap_control_usb: omap-control-usb at 4a002300 {\n" "> -\t\t\tcompatible = \"ti,omap-control-usb\";\n" "> -\t\t\treg = <0x4a002300 0x4>,\n" "> -\t\t\t <0x4a00233c 0x4>;\n" "> -\t\t\treg-names = \"control_dev_conf\", \"otghs_control\";\n" "> -\t\t\tti,type = <1>;\n" - "> +\t\tomap_control_usb2phy: omap-control-usb@4a002300 {\n" + "> +\t\tomap_control_usb2phy: omap-control-usb at 4a002300 {\n" "> +\t\t\tcompatible = \"ti,usb2-control-usb\";\n" "> +\t\t\treg = <0x4a002300 0x4>;\n" "> +\t\t\treg-names = \"power\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tomap_control_usbotg: omap-control-usb@4a00233c {\n" + "> +\t\tomap_control_usbotg: omap-control-usb at 4a00233c {\n" "> +\t\t\tcompatible = \"ti,omap4-control-usb\";\n" "> +\t\t\treg = <0x4a00233c 0x4>;\n" "> +\t\t\treg-names = \"otghs_control\";\n" "> \t\t};\n" ">\n" - "> \t\tusb_otg_hs: usb_otg_hs@4a0ab000 {\n" + "> \t\tusb_otg_hs: usb_otg_hs at 4a0ab000 {\n" "> @@ -661,7 +665,7 @@\n" "> \t\t\tmultipoint = <1>;\n" "> \t\t\tnum-eps = <16>;\n" @@ -85,4 +76,4 @@ "Regards,\n" Benoit -90ef98e52a54fa124a995e232c65c716656b4965abbd6ebae723189be8832bba +59feb654514f2522a33acf3f58dfb4194e473e31d872d3938e92b03296577b3e
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.