diff for duplicates of <511347E8.2030604@ti.com> diff --git a/a/1.txt b/N1/1.txt index f11c146..daeb6e9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ > + - usb-phy : the phandle for the PHY device > > SOC specific device node entry -> usb_otg_hs: usb_otg_hs@4a0ab000 { +> usb_otg_hs: usb_otg_hs at 4a0ab000 { > diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts > index 3705a81..cb07583 100644 > --- a/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -64,7 +64,7 @@ > ti,timer-secure; > }; > + -> + usb_otg_hs: usb_otg_hs@480ab000 { +> + usb_otg_hs: usb_otg_hs at 480ab000 { > + compatible = "ti,omap3-musb"; > + reg = <0x480ab000 0x1000>; > + interrupts = <0 92 0x4>, <0 93 0x4>; @@ -118,7 +118,7 @@ a '-' for property names and not '_' > ti,type = <1>; > }; > + -> + usb_otg_hs: usb_otg_hs@4a0ab000 { +> + usb_otg_hs: usb_otg_hs at 4a0ab000 { > + compatible = "ti,omap4-musb"; > + reg = <0x4a0ab000 0x7ff>; > + interrupts = <0 92 0x4>, <0 93 0x4>; diff --git a/a/content_digest b/N1/content_digest index 8837581..43d5ae1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,9 @@ "ref\01360162604-14320-1-git-send-email-kishon@ti.com\0" "ref\01360162604-14320-4-git-send-email-kishon@ti.com\0" - "From\0Rajendra Nayak <rnayak@ti.com>\0" - "Subject\0Re: [PATCH 3/8] ARM: dts: omap: Add usb_otg and glue data\0" + "From\0rnayak@ti.com (Rajendra Nayak)\0" + "Subject\0[PATCH 3/8] ARM: dts: omap: Add usb_otg and glue data\0" "Date\0Thu, 7 Feb 2013 11:51:28 +0530\0" - "To\0Kishon Vijay Abraham I <kishon@ti.com>\0" - "Cc\0b-cousson@ti.com" - tony@atomide.com - linux@arm.linux.org.uk - rob.herring@calxeda.com - rob@landley.net - balbi@ti.com - linux-usb@vger.kernel.org - linux-omap@vger.kernel.org - linux-kernel@vger.kernel.org - linux-doc@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree-discuss@lists.ozlabs.org - " gregkh@linuxfoundation.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "[]...\n" @@ -33,7 +20,7 @@ "> + - usb-phy : the phandle for the PHY device\n" ">\n" "> SOC specific device node entry\n" - "> usb_otg_hs: usb_otg_hs@4a0ab000 {\n" + "> usb_otg_hs: usb_otg_hs at 4a0ab000 {\n" "> diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts\n" "> index 3705a81..cb07583 100644\n" "> --- a/arch/arm/boot/dts/omap3-beagle-xm.dts\n" @@ -85,7 +72,7 @@ "> \t\t\tti,timer-secure;\n" "> \t\t};\n" "> +\n" - "> +\t\tusb_otg_hs: usb_otg_hs@480ab000 {\n" + "> +\t\tusb_otg_hs: usb_otg_hs at 480ab000 {\n" "> +\t\t\tcompatible = \"ti,omap3-musb\";\n" "> +\t\t\treg = <0x480ab000 0x1000>;\n" "> +\t\t\tinterrupts = <0 92 0x4>, <0 93 0x4>;\n" @@ -139,7 +126,7 @@ "> \t\t\tti,type = <1>;\n" "> \t\t};\n" "> +\n" - "> +\t\tusb_otg_hs: usb_otg_hs@4a0ab000 {\n" + "> +\t\tusb_otg_hs: usb_otg_hs at 4a0ab000 {\n" "> +\t\t\tcompatible = \"ti,omap4-musb\";\n" "> +\t\t\treg = <0x4a0ab000 0x7ff>;\n" "> +\t\t\tinterrupts = <0 92 0x4>, <0 93 0x4>;\n" @@ -168,4 +155,4 @@ "> \t\tusb1v5-supply = <&vusb1v5>;\n" > -480f6eeda503393b94548d198ef49af0a37da377586f5f6dcab67465289a0545 +4ce3f9fa8720bfe196355089f9fcdf57b40e0dca260ef5f3a9cfa5aa4cf4a593
diff --git a/a/content_digest b/N2/content_digest index 8837581..97677e6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,19 +4,19 @@ "Subject\0Re: [PATCH 3/8] ARM: dts: omap: Add usb_otg and glue data\0" "Date\0Thu, 7 Feb 2013 11:51:28 +0530\0" "To\0Kishon Vijay Abraham I <kishon@ti.com>\0" - "Cc\0b-cousson@ti.com" - tony@atomide.com - linux@arm.linux.org.uk - rob.herring@calxeda.com - rob@landley.net - balbi@ti.com - linux-usb@vger.kernel.org - linux-omap@vger.kernel.org - linux-kernel@vger.kernel.org - linux-doc@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree-discuss@lists.ozlabs.org - " gregkh@linuxfoundation.org\0" + "Cc\0<b-cousson@ti.com>" + <tony@atomide.com> + <linux@arm.linux.org.uk> + <rob.herring@calxeda.com> + <rob@landley.net> + <balbi@ti.com> + <linux-usb@vger.kernel.org> + <linux-omap@vger.kernel.org> + <linux-kernel@vger.kernel.org> + <linux-doc@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <devicetree-discuss@lists.ozlabs.org> + " <gregkh@linuxfoundation.org>\0" "\00:1\0" "b\0" "[]...\n" @@ -168,4 +168,4 @@ "> \t\tusb1v5-supply = <&vusb1v5>;\n" > -480f6eeda503393b94548d198ef49af0a37da377586f5f6dcab67465289a0545 +f029d191dfcbef5702a509fff2f970b6bbc8e777fd421521dfd49d12c9a15955
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.