diff for duplicates of <20150805115702.GI12927@tiger> diff --git a/a/1.txt b/N1/1.txt index 4efde5a..23ef5fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,8 +4,8 @@ On Tue, Jul 28, 2015 at 05:43:55PM +0300, Claudiu Manoil wrote: > and their corresponding Rx/Tx/Err interrupt sources are > included as well for each eTSEC node. > -> Signed-off-by: Alison Wang <alison.wang@freescale.com> -> Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com> +> Signed-off-by: Alison Wang <alison.wang-KZfg59tc24xl57MIdRCFDg@public.gmane.org> +> Signed-off-by: Claudiu Manoil <claudiu.manoil-KZfg59tc24xl57MIdRCFDg@public.gmane.org> Applied both with a minor change below. @@ -42,7 +42,7 @@ Shawn > reg = <0x0 0x2d24000 0x0 0x4000>; > }; > -> + enet0: ethernet at 2d10000 { +> + enet0: ethernet@2d10000 { > + compatible = "fsl,etsec2"; > + device_type = "network"; > + #address-cells = <2>; @@ -52,7 +52,7 @@ Shawn > + fsl,magic-packet; > + ranges; > + -> + queue-group at 2d10000 { +> + queue-group@2d10000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d10000 0x0 0x1000>; @@ -61,7 +61,7 @@ Shawn > + <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + queue-group at 2d14000 { +> + queue-group@2d14000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d14000 0x0 0x1000>; @@ -71,7 +71,7 @@ Shawn > + }; > + }; > + -> + enet1: ethernet at 2d50000 { +> + enet1: ethernet@2d50000 { > + compatible = "fsl,etsec2"; > + device_type = "network"; > + #address-cells = <2>; @@ -80,7 +80,7 @@ Shawn > + model = "eTSEC"; > + ranges; > + -> + queue-group at 2d50000 { +> + queue-group@2d50000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d50000 0x0 0x1000>; @@ -89,7 +89,7 @@ Shawn > + <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + queue-group at 2d54000 { +> + queue-group@2d54000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d54000 0x0 0x1000>; @@ -99,7 +99,7 @@ Shawn > + }; > + }; > + -> + enet2: ethernet at 2d90000 { +> + enet2: ethernet@2d90000 { > + compatible = "fsl,etsec2"; > + device_type = "network"; > + #address-cells = <2>; @@ -108,7 +108,7 @@ Shawn > + model = "eTSEC"; > + ranges; > + -> + queue-group at 2d90000 { +> + queue-group@2d90000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d90000 0x0 0x1000>; @@ -117,7 +117,7 @@ Shawn > + <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + queue-group at 2d94000 { +> + queue-group@2d94000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d94000 0x0 0x1000>; @@ -127,7 +127,7 @@ Shawn > + }; > + }; > + -> usb at 8600000 { +> usb@8600000 { > compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr"; > reg = <0x0 0x8600000 0x0 0x1000>; > -- @@ -136,6 +136,10 @@ Shawn > > _______________________________________________ > linux-arm-kernel mailing list -> linux-arm-kernel at lists.infradead.org +> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -> +> +-- +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 f365458..7136d68 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,17 @@ "ref\020150727142816.GP12927@tiger\0" "ref\01438094636-20421-1-git-send-email-claudiu.manoil@freescale.com\0" "ref\01438094636-20421-2-git-send-email-claudiu.manoil@freescale.com\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH,v3 2/3] ARM: dts: ls1021a: Add the eTSEC controller nodes\0" + "ref\01438094636-20421-2-git-send-email-claudiu.manoil-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0" + "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [PATCH,v3 2/3] ARM: dts: ls1021a: Add the eTSEC controller nodes\0" "Date\0Wed, 5 Aug 2015 19:57:02 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Claudiu Manoil <claudiu.manoil-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\0" + "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Alison Wang <alison.wang-KZfg59tc24xl57MIdRCFDg@public.gmane.org> + shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org + " galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org\0" "\00:1\0" "b\0" "On Tue, Jul 28, 2015 at 05:43:55PM +0300, Claudiu Manoil wrote:\n" @@ -13,8 +20,8 @@ "> and their corresponding Rx/Tx/Err interrupt sources are\n" "> included as well for each eTSEC node.\n" "> \n" - "> Signed-off-by: Alison Wang <alison.wang@freescale.com>\n" - "> Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>\n" + "> Signed-off-by: Alison Wang <alison.wang-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n" + "> Signed-off-by: Claudiu Manoil <claudiu.manoil-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n" "\n" "Applied both with a minor change below.\n" "\n" @@ -51,7 +58,7 @@ "> \t\t\treg = <0x0 0x2d24000 0x0 0x4000>;\n" "> \t\t};\n" "> \n" - "> +\t\tenet0: ethernet at 2d10000 {\n" + "> +\t\tenet0: ethernet@2d10000 {\n" "> +\t\t\tcompatible = \"fsl,etsec2\";\n" "> +\t\t\tdevice_type = \"network\";\n" "> +\t\t\t#address-cells = <2>;\n" @@ -61,7 +68,7 @@ "> +\t\t\tfsl,magic-packet;\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\tqueue-group at 2d10000 {\n" + "> +\t\t\tqueue-group@2d10000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d10000 0x0 0x1000>;\n" @@ -70,7 +77,7 @@ "> +\t\t\t\t\t<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tqueue-group at 2d14000 {\n" + "> +\t\t\tqueue-group@2d14000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d14000 0x0 0x1000>;\n" @@ -80,7 +87,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tenet1: ethernet at 2d50000 {\n" + "> +\t\tenet1: ethernet@2d50000 {\n" "> +\t\t\tcompatible = \"fsl,etsec2\";\n" "> +\t\t\tdevice_type = \"network\";\n" "> +\t\t\t#address-cells = <2>;\n" @@ -89,7 +96,7 @@ "> +\t\t\tmodel = \"eTSEC\";\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\tqueue-group at 2d50000 {\n" + "> +\t\t\tqueue-group@2d50000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d50000 0x0 0x1000>;\n" @@ -98,7 +105,7 @@ "> +\t\t\t\t\t<GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tqueue-group at 2d54000 {\n" + "> +\t\t\tqueue-group@2d54000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d54000 0x0 0x1000>;\n" @@ -108,7 +115,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tenet2: ethernet at 2d90000 {\n" + "> +\t\tenet2: ethernet@2d90000 {\n" "> +\t\t\tcompatible = \"fsl,etsec2\";\n" "> +\t\t\tdevice_type = \"network\";\n" "> +\t\t\t#address-cells = <2>;\n" @@ -117,7 +124,7 @@ "> +\t\t\tmodel = \"eTSEC\";\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\tqueue-group at 2d90000 {\n" + "> +\t\t\tqueue-group@2d90000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d90000 0x0 0x1000>;\n" @@ -126,7 +133,7 @@ "> +\t\t\t\t\t<GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tqueue-group at 2d94000 {\n" + "> +\t\t\tqueue-group@2d94000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d94000 0x0 0x1000>;\n" @@ -136,7 +143,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tusb at 8600000 {\n" + "> \t\tusb@8600000 {\n" "> \t\t\tcompatible = \"fsl-usb2-dr-v2.5\", \"fsl-usb2-dr\";\n" "> \t\t\treg = <0x0 0x8600000 0x0 0x1000>;\n" "> -- \n" @@ -145,8 +152,12 @@ "> \n" "> _______________________________________________\n" "> linux-arm-kernel mailing list\n" - "> linux-arm-kernel at lists.infradead.org\n" + "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n" "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\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 -fb0482bd7ba3cfe80933d0e07cba978eb541a7f70e16bc41e08e869800de1150 +1e940c33d2a03d017c931eefd6c42938e1a1ca8719a724502ae3ed2e4743ceed
diff --git a/a/1.txt b/N2/1.txt index 4efde5a..3a19b80 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -42,7 +42,7 @@ Shawn > reg = <0x0 0x2d24000 0x0 0x4000>; > }; > -> + enet0: ethernet at 2d10000 { +> + enet0: ethernet@2d10000 { > + compatible = "fsl,etsec2"; > + device_type = "network"; > + #address-cells = <2>; @@ -52,7 +52,7 @@ Shawn > + fsl,magic-packet; > + ranges; > + -> + queue-group at 2d10000 { +> + queue-group@2d10000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d10000 0x0 0x1000>; @@ -61,7 +61,7 @@ Shawn > + <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + queue-group at 2d14000 { +> + queue-group@2d14000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d14000 0x0 0x1000>; @@ -71,7 +71,7 @@ Shawn > + }; > + }; > + -> + enet1: ethernet at 2d50000 { +> + enet1: ethernet@2d50000 { > + compatible = "fsl,etsec2"; > + device_type = "network"; > + #address-cells = <2>; @@ -80,7 +80,7 @@ Shawn > + model = "eTSEC"; > + ranges; > + -> + queue-group at 2d50000 { +> + queue-group@2d50000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d50000 0x0 0x1000>; @@ -89,7 +89,7 @@ Shawn > + <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + queue-group at 2d54000 { +> + queue-group@2d54000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d54000 0x0 0x1000>; @@ -99,7 +99,7 @@ Shawn > + }; > + }; > + -> + enet2: ethernet at 2d90000 { +> + enet2: ethernet@2d90000 { > + compatible = "fsl,etsec2"; > + device_type = "network"; > + #address-cells = <2>; @@ -108,7 +108,7 @@ Shawn > + model = "eTSEC"; > + ranges; > + -> + queue-group at 2d90000 { +> + queue-group@2d90000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d90000 0x0 0x1000>; @@ -117,7 +117,7 @@ Shawn > + <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + queue-group at 2d94000 { +> + queue-group@2d94000 { > + #address-cells = <2>; > + #size-cells = <2>; > + reg = <0x0 0x2d94000 0x0 0x1000>; @@ -127,7 +127,7 @@ Shawn > + }; > + }; > + -> usb at 8600000 { +> usb@8600000 { > compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr"; > reg = <0x0 0x8600000 0x0 0x1000>; > -- @@ -136,6 +136,6 @@ Shawn > > _______________________________________________ > linux-arm-kernel mailing list -> linux-arm-kernel at lists.infradead.org +> linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > diff --git a/a/content_digest b/N2/content_digest index f365458..ebfb4b1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,16 @@ "ref\020150727142816.GP12927@tiger\0" "ref\01438094636-20421-1-git-send-email-claudiu.manoil@freescale.com\0" "ref\01438094636-20421-2-git-send-email-claudiu.manoil@freescale.com\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH,v3 2/3] ARM: dts: ls1021a: Add the eTSEC controller nodes\0" + "From\0Shawn Guo <shawnguo@kernel.org>\0" + "Subject\0Re: [PATCH,v3 2/3] ARM: dts: ls1021a: Add the eTSEC controller nodes\0" "Date\0Wed, 5 Aug 2015 19:57:02 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Claudiu Manoil <claudiu.manoil@freescale.com>\0" + "Cc\0devicetree@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + Alison Wang <alison.wang@freescale.com> + shawn.guo@linaro.org + " galak@codeaurora.org\0" "\00:1\0" "b\0" "On Tue, Jul 28, 2015 at 05:43:55PM +0300, Claudiu Manoil wrote:\n" @@ -51,7 +57,7 @@ "> \t\t\treg = <0x0 0x2d24000 0x0 0x4000>;\n" "> \t\t};\n" "> \n" - "> +\t\tenet0: ethernet at 2d10000 {\n" + "> +\t\tenet0: ethernet@2d10000 {\n" "> +\t\t\tcompatible = \"fsl,etsec2\";\n" "> +\t\t\tdevice_type = \"network\";\n" "> +\t\t\t#address-cells = <2>;\n" @@ -61,7 +67,7 @@ "> +\t\t\tfsl,magic-packet;\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\tqueue-group at 2d10000 {\n" + "> +\t\t\tqueue-group@2d10000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d10000 0x0 0x1000>;\n" @@ -70,7 +76,7 @@ "> +\t\t\t\t\t<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tqueue-group at 2d14000 {\n" + "> +\t\t\tqueue-group@2d14000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d14000 0x0 0x1000>;\n" @@ -80,7 +86,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tenet1: ethernet at 2d50000 {\n" + "> +\t\tenet1: ethernet@2d50000 {\n" "> +\t\t\tcompatible = \"fsl,etsec2\";\n" "> +\t\t\tdevice_type = \"network\";\n" "> +\t\t\t#address-cells = <2>;\n" @@ -89,7 +95,7 @@ "> +\t\t\tmodel = \"eTSEC\";\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\tqueue-group at 2d50000 {\n" + "> +\t\t\tqueue-group@2d50000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d50000 0x0 0x1000>;\n" @@ -98,7 +104,7 @@ "> +\t\t\t\t\t<GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tqueue-group at 2d54000 {\n" + "> +\t\t\tqueue-group@2d54000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d54000 0x0 0x1000>;\n" @@ -108,7 +114,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tenet2: ethernet at 2d90000 {\n" + "> +\t\tenet2: ethernet@2d90000 {\n" "> +\t\t\tcompatible = \"fsl,etsec2\";\n" "> +\t\t\tdevice_type = \"network\";\n" "> +\t\t\t#address-cells = <2>;\n" @@ -117,7 +123,7 @@ "> +\t\t\tmodel = \"eTSEC\";\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\tqueue-group at 2d90000 {\n" + "> +\t\t\tqueue-group@2d90000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d90000 0x0 0x1000>;\n" @@ -126,7 +132,7 @@ "> +\t\t\t\t\t<GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tqueue-group at 2d94000 {\n" + "> +\t\t\tqueue-group@2d94000 {\n" "> +\t\t\t\t#address-cells = <2>;\n" "> +\t\t\t\t#size-cells = <2>;\n" "> +\t\t\t\treg = <0x0 0x2d94000 0x0 0x1000>;\n" @@ -136,7 +142,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tusb at 8600000 {\n" + "> \t\tusb@8600000 {\n" "> \t\t\tcompatible = \"fsl-usb2-dr-v2.5\", \"fsl-usb2-dr\";\n" "> \t\t\treg = <0x0 0x8600000 0x0 0x1000>;\n" "> -- \n" @@ -145,8 +151,8 @@ "> \n" "> _______________________________________________\n" "> linux-arm-kernel mailing list\n" - "> linux-arm-kernel at lists.infradead.org\n" + "> linux-arm-kernel@lists.infradead.org\n" "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n" > -fb0482bd7ba3cfe80933d0e07cba978eb541a7f70e16bc41e08e869800de1150 +6388accea6810681e64f0814ae23979db6acfdee4de593fe7bb4c4122549d453
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.