diff for duplicates of <3091007.XRV1H99NFV@diego> diff --git a/a/1.txt b/N1/1.txt index fb074e1..1bbf4b3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,9 +1,9 @@ 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: Heiko Stuebner <heiko@sntech.de> +Signed-off-by: Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> +Signed-off-by: Kever Yang <kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> +Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> --- arch/arm/boot/dts/rk3288.dtsi | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) @@ -16,7 +16,7 @@ index e7cb008..5950b0a 100644 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>; @@ -25,9 +25,9 @@ index e7cb008..5950b0a 100644 + 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>; @@ -36,14 +36,14 @@ index e7cb008..5950b0a 100644 + status = "disabled"; + }; + - i2c0: i2c at ff650000 { + i2c0: i2c@ff650000 { compatible = "rockchip,rk3288-i2c"; reg = <0xff650000 0x1000>; @@ -251,26 +271,6 @@ 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>; @@ -52,9 +52,9 @@ index e7cb008..5950b0a 100644 - 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>; @@ -63,8 +63,14 @@ index e7cb008..5950b0a 100644 - status = "disabled"; - }; - - gic: interrupt-controller at ffc01000 { + gic: interrupt-controller@ffc01000 { compatible = "arm,gic-400"; interrupt-controller; -- 2.0.0.526.g5318336 + + +-- +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 b0a5295..cb5104c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,28 @@ - "From\0dianders@chromium.org (Doug Anderson)\0" + "From\0Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>\0" "Subject\0[PATCH] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi\0" "Date\0Thu, 07 Aug 2014 17:15:03 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org\0" + "Cc\0heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org" + Sonny Rao <sonnyrao-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org + Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@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" "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: Heiko Stuebner <heiko@sntech.de>\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" + "Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/rk3288.dtsi | 40 ++++++++++++++++++++--------------------\n" " 1 file changed, 20 insertions(+), 20 deletions(-)\n" @@ -22,7 +35,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" @@ -31,9 +44,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" @@ -42,14 +55,14 @@ "+\t\tstatus = \"disabled\";\n" "+\t};\n" "+\n" - " \ti2c0: i2c at ff650000 {\n" + " \ti2c0: i2c@ff650000 {\n" " \t\tcompatible = \"rockchip,rk3288-i2c\";\n" " \t\treg = <0xff650000 0x1000>;\n" "@@ -251,26 +271,6 @@\n" " \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" @@ -58,9 +71,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" @@ -69,10 +82,16 @@ "-\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;\n" "-- \n" - 2.0.0.526.g5318336 + "2.0.0.526.g5318336\n" + "\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 -b6eab0095e08a18ef0d2c2b3dec0b4c1e1ecf252a544ef937d39d890bb0853e0 +208cbe6beca99a7b03771efea16ca19631421f7f1e77e57d7442ce71d89e2a8b
diff --git a/a/1.txt b/N2/1.txt index fb074e1..292524a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,7 +16,7 @@ index e7cb008..5950b0a 100644 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>; @@ -25,9 +25,9 @@ index e7cb008..5950b0a 100644 + 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>; @@ -36,14 +36,14 @@ index e7cb008..5950b0a 100644 + status = "disabled"; + }; + - i2c0: i2c at ff650000 { + i2c0: i2c@ff650000 { compatible = "rockchip,rk3288-i2c"; reg = <0xff650000 0x1000>; @@ -251,26 +271,6 @@ 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>; @@ -52,9 +52,9 @@ index e7cb008..5950b0a 100644 - 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>; @@ -63,7 +63,7 @@ index e7cb008..5950b0a 100644 - 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 b0a5295..148b20f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,20 @@ - "From\0dianders@chromium.org (Doug Anderson)\0" + "From\0Doug Anderson <dianders@chromium.org>\0" "Subject\0[PATCH] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi\0" "Date\0Thu, 07 Aug 2014 17:15:03 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0arm@kernel.org\0" + "Cc\0heiko@sntech.de" + Sonny Rao <sonnyrao@chromium.org> + linux-arm-kernel@lists.infradead.org + kever.yang@rock-chips.com + Doug Anderson <dianders@chromium.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" "The EHCI and HSIC device tree nodes were added in the wrong place.\n" @@ -22,7 +35,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" @@ -31,9 +44,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" @@ -42,14 +55,14 @@ "+\t\tstatus = \"disabled\";\n" "+\t};\n" "+\n" - " \ti2c0: i2c at ff650000 {\n" + " \ti2c0: i2c@ff650000 {\n" " \t\tcompatible = \"rockchip,rk3288-i2c\";\n" " \t\treg = <0xff650000 0x1000>;\n" "@@ -251,26 +271,6 @@\n" " \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" @@ -58,9 +71,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" @@ -69,10 +82,10 @@ "-\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;\n" "-- \n" 2.0.0.526.g5318336 -b6eab0095e08a18ef0d2c2b3dec0b4c1e1ecf252a544ef937d39d890bb0853e0 +655cbbee6d066deb57dad1c7695c005c1023c3a02be76a7d4efe513d17b9005e
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.