diff for duplicates of <20140722131832.GY8537@dragon> diff --git a/a/1.txt b/N1/1.txt index c4fac4c..bf4cfae 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,15 +30,15 @@ On Tue, Jul 22, 2014 at 11:57:31AM +0200, Stefan Agner wrote: > >> gpio-ranges = <&iomuxc 0 128 7>; > >> }; > >> -> >> - anatop at 40050000 { +> >> - anatop@40050000 { > >> - compatible = "fsl,vf610-anatop"; > >> - reg = <0x40050000 0x1000>; -> >> + anatop: anatop at 40050000 { +> >> + anatop: anatop@40050000 { > >> + compatible = "fsl,vf610-anatop", "syscon"; > >> + reg = <0x40050000 0x400>; > >> + }; > >> + -> >> + usbphy0: usbphy at 40050800 { +> >> + usbphy0: usbphy@40050800 { > >> + compatible = "fsl,vf610-usbphy", "fsl,imx23-usbphy"; > > > > Since phy driver will match "fsl,vf610-usbphy" anyway, we do not need @@ -51,7 +51,7 @@ On Tue, Jul 22, 2014 at 11:57:31AM +0200, Stefan Agner wrote: > >> #clock-cells = <1>; > >> }; > >> + -> >> + usbdev0: usb at 40034000 { +> >> + usbdev0: usb@40034000 { > >> + compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; > > > > It doesn't really make any sense to have "fsl,imx6q-usb" here. The diff --git a/a/content_digest b/N1/content_digest index 028e99a..6932953 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,16 @@ "ref\0839af70e8acf139bc0f7bbdb4dd68dd146b5d6a8.1405702442.git.stefan@agner.ch\0" "ref\020140722022232.GR8537@dragon\0" "ref\064fa5f4fcf6d1331796d2fd7899e3cbd@agner.ch\0" - "From\0shawn.guo@freescale.com (Shawn Guo)\0" - "Subject\0[PATCH 1/6] ARM: dts: vf610: add USB PHY and controller\0" + "From\0Shawn Guo <shawn.guo@freescale.com>\0" + "Subject\0Re: [PATCH 1/6] ARM: dts: vf610: add USB PHY and controller\0" "Date\0Tue, 22 Jul 2014 21:18:33 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Stefan Agner <stefan@agner.ch>\0" + "Cc\0<peter.chen@freescale.com>" + <s.hauer@pengutronix.de> + <b35083@freescale.com> + <linux-arm-kernel@lists.infradead.org> + <linux-usb@vger.kernel.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On Tue, Jul 22, 2014 at 11:57:31AM +0200, Stefan Agner wrote:\n" @@ -40,15 +46,15 @@ "> >> \t\t\t\tgpio-ranges = <&iomuxc 0 128 7>;\n" "> >> \t\t\t};\n" "> >>\n" - "> >> -\t\t\tanatop at 40050000 {\n" + "> >> -\t\t\tanatop@40050000 {\n" "> >> -\t\t\t\tcompatible = \"fsl,vf610-anatop\";\n" "> >> -\t\t\t\treg = <0x40050000 0x1000>;\n" - "> >> +\t\t\tanatop: anatop at 40050000 {\n" + "> >> +\t\t\tanatop: anatop@40050000 {\n" "> >> +\t\t\t\tcompatible = \"fsl,vf610-anatop\", \"syscon\";\n" "> >> +\t\t\t\treg = <0x40050000 0x400>;\n" "> >> +\t\t\t};\n" "> >> +\n" - "> >> +\t\t\tusbphy0: usbphy at 40050800 {\n" + "> >> +\t\t\tusbphy0: usbphy@40050800 {\n" "> >> +\t\t\t\tcompatible = \"fsl,vf610-usbphy\", \"fsl,imx23-usbphy\";\n" "> > \n" "> > Since phy driver will match \"fsl,vf610-usbphy\" anyway, we do not need\n" @@ -61,7 +67,7 @@ "> >> \t\t\t\t#clock-cells = <1>;\n" "> >> \t\t\t};\n" "> >> +\n" - "> >> +\t\t\tusbdev0: usb at 40034000 {\n" + "> >> +\t\t\tusbdev0: usb@40034000 {\n" "> >> +\t\t\t\tcompatible = \"fsl,imx6q-usb\", \"fsl,imx27-usb\";\n" "> > \n" "> > It doesn't really make any sense to have \"fsl,imx6q-usb\" here. The\n" @@ -94,4 +100,4 @@ "\n" Shawn -9b343a43643745c34e32f92f2598c5fdb0ce7b0f31b8680f2e1f8f2dc4e5cd0b +ada3c954c7baa80d04a8bb1d879430ec6ccc9967cfc877176a14691bb781b5c8
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.