diff for duplicates of <5965899.y405fxfhDg@diego> diff --git a/a/1.txt b/N1/1.txt index 5719116..291e4a1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,15 +2,15 @@ Am Donnerstag, 31. Juli 2014, 15:49:35 schrieb Doug Anderson: > The EHCI and HSIC device tree nodes were added in the wrong place. > Fix them. > -> Signed-off-by: Doug Anderson <dianders@chromium.org> -> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> +> Signed-off-by: Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> +> Signed-off-by: Kever Yang <kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> hmm, not sure if this counts as fix ... aka material for 3.17-rc2 or should wait for 3.18. Simply because it's more a cosmetic thing. If it is a fix, could base it on the appropriate dts revision, because here it's in the middle of the dwc2 series, including the - usb_host1: usb at ff540000 + usb_host1: usb@ff540000 nodes. @@ -35,7 +35,7 @@ Heiko > status = "disabled"; > }; > -> + usb_host0_ehci: usb at ff500000 { +> + usb_host0_ehci: usb@ff500000 { > + compatible = "generic-ehci"; > + reg = <0xff500000 0x100>; > + interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; @@ -44,16 +44,16 @@ Heiko > + status = "disabled"; > + }; > + -> + /* NOTE: ohci at ff520000 doesn't actually work on hardware */ +> + /* NOTE: ohci@ff520000 doesn't actually work on hardware */ > + -> usb_host1: usb at ff540000 { +> usb_host1: usb@ff540000 { > compatible = "rockchip,rk3288-usb", "rockchip,rk3066-usb", > "snps,dwc2"; > @@ -176,6 +187,15 @@ > status = "disabled"; > }; > -> + usb_hsic: usb at ff5c0000 { +> + usb_hsic: usb@ff5c0000 { > + compatible = "generic-ehci"; > + reg = <0xff5c0000 0x100>; > + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; @@ -62,7 +62,7 @@ Heiko > + status = "disabled"; > + }; > + -> uart2: serial at ff690000 { +> uart2: serial@ff690000 { > compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart"; > reg = <0xff690000 0x100>; > @@ -270,27 +290,6 @@ @@ -70,7 +70,7 @@ Heiko > status = "disabled"; > }; > - -> - usb_host0_ehci: usb at ff500000 { +> - usb_host0_ehci: usb@ff500000 { > - compatible = "generic-ehci"; > - reg = <0xff500000 0x100>; > - interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; @@ -79,9 +79,9 @@ Heiko > - status = "disabled"; > - }; > - -> - /* NOTE: ohci at ff520000 doesn't actually work on hardware */ +> - /* NOTE: ohci@ff520000 doesn't actually work on hardware */ > - -> - usb_hsic: usb at ff5c0000 { +> - usb_hsic: usb@ff5c0000 { > - compatible = "generic-ehci"; > - reg = <0xff5c0000 0x100>; > - interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; @@ -90,6 +90,11 @@ Heiko > - status = "disabled"; > - }; > - -> gic: interrupt-controller at ffc01000 { +> gic: interrupt-controller@ffc01000 { > compatible = "arm,gic-400"; > interrupt-controller; + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 376836d..e5cb1ad 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,37 @@ "ref\01406846976-23127-4-git-send-email-dianders@chromium.org\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" - "Subject\0[PATCH v4 4/5] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi\0" + "ref\01406846976-23127-4-git-send-email-dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org\0" + "From\0Heiko St\303\274bner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\0" + "Subject\0Re: [PATCH v4 4/5] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi\0" "Date\0Fri, 01 Aug 2014 11:17:27 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>" + " olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org\0" + "Cc\0Paul Zimmerman <paulz-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>" + kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org + Sonny Rao <sonnyrao-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + pawel.moll-5wv7dgnIgG8@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Am Donnerstag, 31. Juli 2014, 15:49:35 schrieb Doug Anderson:\n" "> The EHCI and HSIC device tree nodes were added in the wrong place.\n" "> Fix them.\n" "> \n" - "> Signed-off-by: Doug Anderson <dianders@chromium.org>\n" - "> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>\n" + "> Signed-off-by: Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>\n" + "> Signed-off-by: Kever Yang <kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>\n" "\n" "hmm, not sure if this counts as fix ... aka material for 3.17-rc2 or should \n" "wait for 3.18. Simply because it's more a cosmetic thing.\n" "\n" "If it is a fix, could base it on the appropriate dts revision, because here \n" "it's in the middle of the dwc2 series, including the\n" - "\tusb_host1: usb at ff540000\n" + "\tusb_host1: usb@ff540000\n" "nodes.\n" "\n" "\n" @@ -42,7 +56,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tusb_host0_ehci: usb at ff500000 {\n" + "> +\tusb_host0_ehci: usb@ff500000 {\n" "> +\t\tcompatible = \"generic-ehci\";\n" "> +\t\treg = <0xff500000 0x100>;\n" "> +\t\tinterrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -51,16 +65,16 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> +\t/* NOTE: ohci at ff520000 doesn't actually work on hardware */\n" + "> +\t/* NOTE: ohci@ff520000 doesn't actually work on hardware */\n" "> +\n" - "> \tusb_host1: usb at ff540000 {\n" + "> \tusb_host1: usb@ff540000 {\n" "> \t\tcompatible = \"rockchip,rk3288-usb\", \"rockchip,rk3066-usb\",\n" "> \t\t\t\t\"snps,dwc2\";\n" "> @@ -176,6 +187,15 @@\n" "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tusb_hsic: usb at ff5c0000 {\n" + "> +\tusb_hsic: usb@ff5c0000 {\n" "> +\t\tcompatible = \"generic-ehci\";\n" "> +\t\treg = <0xff5c0000 0x100>;\n" "> +\t\tinterrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -69,7 +83,7 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> \tuart2: serial at ff690000 {\n" + "> \tuart2: serial@ff690000 {\n" "> \t\tcompatible = \"rockchip,rk3288-uart\", \"snps,dw-apb-uart\";\n" "> \t\treg = <0xff690000 0x100>;\n" "> @@ -270,27 +290,6 @@\n" @@ -77,7 +91,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> -\n" - "> -\tusb_host0_ehci: usb at ff500000 {\n" + "> -\tusb_host0_ehci: usb@ff500000 {\n" "> -\t\tcompatible = \"generic-ehci\";\n" "> -\t\treg = <0xff500000 0x100>;\n" "> -\t\tinterrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -86,9 +100,9 @@ "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" "> -\n" - "> -\t/* NOTE: ohci at ff520000 doesn't actually work on hardware */\n" + "> -\t/* NOTE: ohci@ff520000 doesn't actually work on hardware */\n" "> -\n" - "> -\tusb_hsic: usb at ff5c0000 {\n" + "> -\tusb_hsic: usb@ff5c0000 {\n" "> -\t\tcompatible = \"generic-ehci\";\n" "> -\t\treg = <0xff5c0000 0x100>;\n" "> -\t\tinterrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -97,8 +111,13 @@ "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" "> -\n" - "> \tgic: interrupt-controller at ffc01000 {\n" + "> \tgic: interrupt-controller@ffc01000 {\n" "> \t\tcompatible = \"arm,gic-400\";\n" - "> \t\tinterrupt-controller;" + "> \t\tinterrupt-controller;\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -a20a5d8d77060dcc7be6b7af1cd63960f09a914c67074c0ac5ef71902fbc55e8 +9327946f9a74a7ad0ee897f49ba03c6dead42bb27fe83f6b636a490861df37d2
diff --git a/a/1.txt b/N2/1.txt index 5719116..b9418fb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -10,7 +10,7 @@ wait for 3.18. Simply because it's more a cosmetic thing. If it is a fix, could base it on the appropriate dts revision, because here it's in the middle of the dwc2 series, including the - usb_host1: usb at ff540000 + usb_host1: usb@ff540000 nodes. @@ -35,7 +35,7 @@ Heiko > status = "disabled"; > }; > -> + usb_host0_ehci: usb at ff500000 { +> + usb_host0_ehci: usb@ff500000 { > + compatible = "generic-ehci"; > + reg = <0xff500000 0x100>; > + interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; @@ -44,16 +44,16 @@ Heiko > + status = "disabled"; > + }; > + -> + /* NOTE: ohci at ff520000 doesn't actually work on hardware */ +> + /* NOTE: ohci@ff520000 doesn't actually work on hardware */ > + -> usb_host1: usb at ff540000 { +> usb_host1: usb@ff540000 { > compatible = "rockchip,rk3288-usb", "rockchip,rk3066-usb", > "snps,dwc2"; > @@ -176,6 +187,15 @@ > status = "disabled"; > }; > -> + usb_hsic: usb at ff5c0000 { +> + usb_hsic: usb@ff5c0000 { > + compatible = "generic-ehci"; > + reg = <0xff5c0000 0x100>; > + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; @@ -62,7 +62,7 @@ Heiko > + status = "disabled"; > + }; > + -> uart2: serial at ff690000 { +> uart2: serial@ff690000 { > compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart"; > reg = <0xff690000 0x100>; > @@ -270,27 +290,6 @@ @@ -70,7 +70,7 @@ Heiko > status = "disabled"; > }; > - -> - usb_host0_ehci: usb at ff500000 { +> - usb_host0_ehci: usb@ff500000 { > - compatible = "generic-ehci"; > - reg = <0xff500000 0x100>; > - interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; @@ -79,9 +79,9 @@ Heiko > - status = "disabled"; > - }; > - -> - /* NOTE: ohci at ff520000 doesn't actually work on hardware */ +> - /* NOTE: ohci@ff520000 doesn't actually work on hardware */ > - -> - usb_hsic: usb at ff5c0000 { +> - usb_hsic: usb@ff5c0000 { > - compatible = "generic-ehci"; > - reg = <0xff5c0000 0x100>; > - interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; @@ -90,6 +90,6 @@ Heiko > - status = "disabled"; > - }; > - -> gic: interrupt-controller at ffc01000 { +> gic: interrupt-controller@ffc01000 { > compatible = "arm,gic-400"; > interrupt-controller; diff --git a/a/content_digest b/N2/content_digest index 376836d..b184747 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,21 @@ "ref\01406846976-23127-4-git-send-email-dianders@chromium.org\0" - "From\0heiko@sntech.de (Heiko St\303\274bner)\0" - "Subject\0[PATCH v4 4/5] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi\0" + "From\0Heiko St\303\274bner <heiko@sntech.de>\0" + "Subject\0Re: [PATCH v4 4/5] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi\0" "Date\0Fri, 01 Aug 2014 11:17:27 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Doug Anderson <dianders@chromium.org>" + " olof@lixom.net\0" + "Cc\0Paul Zimmerman <paulz@synopsys.com>" + kever.yang@rock-chips.com + Sonny Rao <sonnyrao@chromium.org> + linux-arm-kernel@lists.infradead.org + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + linux@arm.linux.org.uk + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Am Donnerstag, 31. Juli 2014, 15:49:35 schrieb Doug Anderson:\n" @@ -17,7 +30,7 @@ "\n" "If it is a fix, could base it on the appropriate dts revision, because here \n" "it's in the middle of the dwc2 series, including the\n" - "\tusb_host1: usb at ff540000\n" + "\tusb_host1: usb@ff540000\n" "nodes.\n" "\n" "\n" @@ -42,7 +55,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tusb_host0_ehci: usb at ff500000 {\n" + "> +\tusb_host0_ehci: usb@ff500000 {\n" "> +\t\tcompatible = \"generic-ehci\";\n" "> +\t\treg = <0xff500000 0x100>;\n" "> +\t\tinterrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -51,16 +64,16 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> +\t/* NOTE: ohci at ff520000 doesn't actually work on hardware */\n" + "> +\t/* NOTE: ohci@ff520000 doesn't actually work on hardware */\n" "> +\n" - "> \tusb_host1: usb at ff540000 {\n" + "> \tusb_host1: usb@ff540000 {\n" "> \t\tcompatible = \"rockchip,rk3288-usb\", \"rockchip,rk3066-usb\",\n" "> \t\t\t\t\"snps,dwc2\";\n" "> @@ -176,6 +187,15 @@\n" "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tusb_hsic: usb at ff5c0000 {\n" + "> +\tusb_hsic: usb@ff5c0000 {\n" "> +\t\tcompatible = \"generic-ehci\";\n" "> +\t\treg = <0xff5c0000 0x100>;\n" "> +\t\tinterrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -69,7 +82,7 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> \tuart2: serial at ff690000 {\n" + "> \tuart2: serial@ff690000 {\n" "> \t\tcompatible = \"rockchip,rk3288-uart\", \"snps,dw-apb-uart\";\n" "> \t\treg = <0xff690000 0x100>;\n" "> @@ -270,27 +290,6 @@\n" @@ -77,7 +90,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> -\n" - "> -\tusb_host0_ehci: usb at ff500000 {\n" + "> -\tusb_host0_ehci: usb@ff500000 {\n" "> -\t\tcompatible = \"generic-ehci\";\n" "> -\t\treg = <0xff500000 0x100>;\n" "> -\t\tinterrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -86,9 +99,9 @@ "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" "> -\n" - "> -\t/* NOTE: ohci at ff520000 doesn't actually work on hardware */\n" + "> -\t/* NOTE: ohci@ff520000 doesn't actually work on hardware */\n" "> -\n" - "> -\tusb_hsic: usb at ff5c0000 {\n" + "> -\tusb_hsic: usb@ff5c0000 {\n" "> -\t\tcompatible = \"generic-ehci\";\n" "> -\t\treg = <0xff5c0000 0x100>;\n" "> -\t\tinterrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -97,8 +110,8 @@ "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" "> -\n" - "> \tgic: interrupt-controller at ffc01000 {\n" + "> \tgic: interrupt-controller@ffc01000 {\n" "> \t\tcompatible = \"arm,gic-400\";\n" "> \t\tinterrupt-controller;" -a20a5d8d77060dcc7be6b7af1cd63960f09a914c67074c0ac5ef71902fbc55e8 +23d3f7d6e2b9b473150d34af68555ac52958e1bbaf12e562f537f340c442d105
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.