diff for duplicates of <20140722022232.GR8537@dragon> diff --git a/a/1.txt b/N1/1.txt index 9b1c968..55dfeaf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,15 +28,15 @@ On Fri, Jul 18, 2014 at 07:01:37PM +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 @@ -48,7 +48,7 @@ Since phy driver will match "fsl,vf610-usbphy" anyway, we do not need > + fsl,anatop = <&anatop>; > + }; > + -> + usbphy1: usbphy at 40050c00 { +> + usbphy1: usbphy@40050c00 { > + compatible = "fsl,vf610-usbphy", "fsl,imx23-usbphy"; > + reg = <0x40050c00 0x400>; > + interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>; @@ -56,13 +56,13 @@ Since phy driver will match "fsl,vf610-usbphy" anyway, we do not need > + fsl,anatop = <&anatop>; > }; > -> i2c0: i2c at 40066000 { +> i2c0: i2c@40066000 { > @@ -309,6 +327,18 @@ > reg = <0x4006b000 0x1000>; > #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 @@ -83,12 +83,12 @@ Shawn > + > }; > -> aips1: aips-bus at 40080000 { +> aips1: aips-bus@40080000 { > @@ -371,6 +401,16 @@ > status = "disabled"; > }; > -> + usbh1: usb at 400b4000 { +> + usbh1: usb@400b4000 { > + compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; > + reg = <0x400b4000 0x800>; > + interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; @@ -98,7 +98,7 @@ Shawn > + status = "disabled"; > + }; > + -> ftm: ftm at 400b8000 { +> ftm: ftm@400b8000 { > compatible = "fsl,ftm-timer"; > reg = <0x400b8000 0x1000 0x400b9000 0x1000>; > -- diff --git a/a/content_digest b/N1/content_digest index 520452b..3420669 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,15 @@ "ref\0cover.1405702442.git.stefan@agner.ch\0" "ref\0839af70e8acf139bc0f7bbdb4dd68dd146b5d6a8.1405702442.git.stefan@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 10:22: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 Fri, Jul 18, 2014 at 07:01:37PM +0200, Stefan Agner wrote:\n" @@ -36,15 +42,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" @@ -56,7 +62,7 @@ "> +\t\t\t\tfsl,anatop = <&anatop>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusbphy1: usbphy at 40050c00 {\n" + "> +\t\t\tusbphy1: usbphy@40050c00 {\n" "> +\t\t\t\tcompatible = \"fsl,vf610-usbphy\", \"fsl,imx23-usbphy\";\n" "> +\t\t\t\treg = <0x40050c00 0x400>;\n" "> +\t\t\t\tinterrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -64,13 +70,13 @@ "> +\t\t\t\tfsl,anatop = <&anatop>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\ti2c0: i2c at 40066000 {\n" + "> \t\t\ti2c0: i2c@40066000 {\n" "> @@ -309,6 +327,18 @@\n" "> \t\t\t\treg = <0x4006b000 0x1000>;\n" "> \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" @@ -91,12 +97,12 @@ "> +\n" "> \t\t};\n" "> \n" - "> \t\taips1: aips-bus at 40080000 {\n" + "> \t\taips1: aips-bus@40080000 {\n" "> @@ -371,6 +401,16 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tusbh1: usb at 400b4000 {\n" + "> +\t\t\tusbh1: usb@400b4000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6q-usb\", \"fsl,imx27-usb\";\n" "> +\t\t\t\treg = <0x400b4000 0x800>;\n" "> +\t\t\t\tinterrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -106,11 +112,11 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tftm: ftm at 400b8000 {\n" + "> \t\t\tftm: ftm@400b8000 {\n" "> \t\t\t\tcompatible = \"fsl,ftm-timer\";\n" "> \t\t\t\treg = <0x400b8000 0x1000 0x400b9000 0x1000>;\n" "> -- \n" "> 2.0.1\n" > -0281911f21f61fc5853138fb5768ce14ed72195c680af809258a5dd20c1eecdf +a5d7d2ebb007a7140d860553fd48b191f9ae25c4cbe80ea30ce29462443a0f44
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.