diff for duplicates of <20150504212457.GB4810@atomide.com> diff --git a/a/1.txt b/N1/1.txt index c59fdb1..c9bf826 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,7 +31,7 @@ Trying again :) > > ocp { > > ... > > -> > edma: tpcc@49000000 { +> > edma: tpcc at 49000000 { > > compatible = "ti,edma3"; > > ti,hwmods = "tpcc"; > > reg = <0x49000000 0x10000>; @@ -39,19 +39,19 @@ Trying again :) > > #dma-cells = <1>; > > }; > > -> > tptc0: tptc@49800000 { +> > tptc0: tptc at 49800000 { > > compatible = "ti,tptc3"; > > ti,hwmods = "tptc0"; > > reg = <0x49800000 0x10000>; > > }; > > -> > tptc1: tptc@49900000 { +> > tptc1: tptc at 49900000 { > > compatible = "ti,tptc3"; > > ti,hwmods = "tptc1"; > > reg = <0x49900000 0x10000>; > > }; > > -> > tptc2: tptc@49a00000 { +> > tptc2: tptc at 49a00000 { > > compatible = "ti,tptc3"; > > ti,hwmods = "tptc2"; > > reg = <0x49a00000 0x10000>; @@ -75,7 +75,7 @@ Tony > Loading ARM Linux zImage '/mnt/mmc0.1//boot/zImage' > Loading devicetree from '/mnt/mmc0.1//boot/am335x-afi-gf.dtb' > commandline: console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait loglevel=6 -> [ 0.000000] Linux version 4.1.0-rc1 (rsc@callisto) (gcc version 4.8.3 20131111 (prerelease) (OSELAS.Toolchain-2013.12.2 linaro-4.8-2013.11) ) #9 PREEMPT Mon May 4 22:24:41 CEST 2015 +> [ 0.000000] Linux version 4.1.0-rc1 (rsc at callisto) (gcc version 4.8.3 20131111 (prerelease) (OSELAS.Toolchain-2013.12.2 linaro-4.8-2013.11) ) #9 PREEMPT Mon May 4 22:24:41 CEST 2015 > [ 0.000000] earlycon: no match for ttyO2,115200n8 > [ 0.000000] Kernel command line: console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait loglevel=6 > [ 0.000000] Virtual kernel memory layout: @@ -111,7 +111,7 @@ Tony > > ----------8<---------- Output with patch ----------8<---------- > -> [ 0.000000] Linux version 4.1.0-rc1+ (rsc@callisto) (gcc version 4.8.3 20131111 (prerelease) (OSELAS.Toolchain-2013.12.2 linaro-4.8-2013.11) ) #10 PREEMPT Mon May 4 23:03:27 CEST 2015 +> [ 0.000000] Linux version 4.1.0-rc1+ (rsc at callisto) (gcc version 4.8.3 20131111 (prerelease) (OSELAS.Toolchain-2013.12.2 linaro-4.8-2013.11) ) #10 PREEMPT Mon May 4 23:03:27 CEST 2015 > [ 0.000000] earlycon: no match for ttyO2,115200n8 > [ 0.000000] Kernel command line: console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait loglevel=6 > [ 0.000000] Virtual kernel memory layout: @@ -153,8 +153,8 @@ Tony > reg = <0x48200000 0x1000>; > }; > -> - edma: edma@49000000 { -> + edma: tpcc@49000000 { +> - edma: edma at 49000000 { +> + edma: tpcc at 49000000 { > compatible = "ti,edma3"; > - ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; > - reg = <0x49000000 0x10000>, @@ -165,25 +165,25 @@ Tony > #dma-cells = <1>; > }; > -> + tptc0: tptc@49800000 { +> + tptc0: tptc at 49800000 { > + compatible = "ti,tptc3"; > + ti,hwmods = "tptc0"; > + reg = <0x49800000 0x10000>; > + }; > + -> + tptc1: tptc@49900000 { +> + tptc1: tptc at 49900000 { > + compatible = "ti,tptc3"; > + ti,hwmods = "tptc1"; > + reg = <0x49900000 0x10000>; > + }; > + -> + tptc2: tptc@49a00000 { +> + tptc2: tptc at 49a00000 { > + compatible = "ti,tptc3"; > + ti,hwmods = "tptc2"; > + reg = <0x49a00000 0x10000>; > + }; > + -> gpio0: gpio@44e07000 { +> gpio0: gpio at 44e07000 { > compatible = "ti,omap4-gpio"; > ti,hwmods = "gpio1"; > diff --git a/a/content_digest b/N1/content_digest index 11b34dc..a2c7fcc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,10 @@ "ref\020150504064323.GU15254@pengutronix.de\0" "ref\020150504141103.GD24469@atomide.com\0" "ref\020150504211150.GU15254@pengutronix.de\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: EDMA oftree entry for AM335x\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0EDMA oftree entry for AM335x\0" "Date\0Mon, 4 May 2015 14:24:57 -0700\0" - "To\0Robert Schwebel <r.schwebel@pengutronix.de>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - " Beno\303\256t Cousson <bcousson@baylibre.com>" - " Peter Ujfalusi <peter.ujfalusi@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Robert Schwebel <r.schwebel@pengutronix.de> [150504 14:13]:\n" @@ -44,7 +40,7 @@ "> > ocp {\n" "> > \t...\n" "> > \n" - "> > \tedma: tpcc@49000000 {\n" + "> > \tedma: tpcc at 49000000 {\n" "> > \t\tcompatible = \"ti,edma3\";\n" "> > \t\tti,hwmods = \"tpcc\"; \n" "> > \t\treg = <0x49000000 0x10000>;\n" @@ -52,19 +48,19 @@ "> > \t\t#dma-cells = <1>;\n" "> > \t};\n" "> > \n" - "> > \ttptc0: tptc@49800000 {\n" + "> > \ttptc0: tptc at 49800000 {\n" "> > \t\tcompatible = \"ti,tptc3\";\n" "> > \t\tti,hwmods = \"tptc0\";\n" "> > \t\treg = <0x49800000 0x10000>;\n" "> > \t};\n" "> > \n" - "> > \ttptc1: tptc@49900000 {\n" + "> > \ttptc1: tptc at 49900000 {\n" "> > \t\tcompatible = \"ti,tptc3\";\n" "> > \t\tti,hwmods = \"tptc1\";\n" "> > \t\treg = <0x49900000 0x10000>;\n" "> > \t};\n" "> > \n" - "> > \ttptc2: tptc@49a00000 {\n" + "> > \ttptc2: tptc at 49a00000 {\n" "> > \t\tcompatible = \"ti,tptc3\";\n" "> > \t\tti,hwmods = \"tptc2\";\n" "> > \t\treg = <0x49a00000 0x10000>;\n" @@ -88,7 +84,7 @@ "> Loading ARM Linux zImage '/mnt/mmc0.1//boot/zImage'\n" "> Loading devicetree from '/mnt/mmc0.1//boot/am335x-afi-gf.dtb'\n" "> commandline: console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait loglevel=6\n" - "> [ 0.000000] Linux version 4.1.0-rc1 (rsc@callisto) (gcc version 4.8.3 20131111 (prerelease) (OSELAS.Toolchain-2013.12.2 linaro-4.8-2013.11) ) #9 PREEMPT Mon May 4 22:24:41 CEST 2015\n" + "> [ 0.000000] Linux version 4.1.0-rc1 (rsc at callisto) (gcc version 4.8.3 20131111 (prerelease) (OSELAS.Toolchain-2013.12.2 linaro-4.8-2013.11) ) #9 PREEMPT Mon May 4 22:24:41 CEST 2015\n" "> [ 0.000000] earlycon: no match for ttyO2,115200n8\n" "> [ 0.000000] Kernel command line: console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait loglevel=6\n" "> [ 0.000000] Virtual kernel memory layout:\n" @@ -124,7 +120,7 @@ "> \n" "> ----------8<---------- Output with patch ----------8<----------\n" "> \n" - "> [ 0.000000] Linux version 4.1.0-rc1+ (rsc@callisto) (gcc version 4.8.3 20131111 (prerelease) (OSELAS.Toolchain-2013.12.2 linaro-4.8-2013.11) ) #10 PREEMPT Mon May 4 23:03:27 CEST 2015\n" + "> [ 0.000000] Linux version 4.1.0-rc1+ (rsc at callisto) (gcc version 4.8.3 20131111 (prerelease) (OSELAS.Toolchain-2013.12.2 linaro-4.8-2013.11) ) #10 PREEMPT Mon May 4 23:03:27 CEST 2015\n" "> [ 0.000000] earlycon: no match for ttyO2,115200n8\n" "> [ 0.000000] Kernel command line: console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait loglevel=6\n" "> [ 0.000000] Virtual kernel memory layout:\n" @@ -166,8 +162,8 @@ "> \t\t\treg = <0x48200000 0x1000>;\n" "> \t\t};\n" "> \n" - "> -\t\tedma: edma@49000000 {\n" - "> +\t\tedma: tpcc@49000000 {\n" + "> -\t\tedma: edma at 49000000 {\n" + "> +\t\tedma: tpcc at 49000000 {\n" "> \t\t\tcompatible = \"ti,edma3\";\n" "> -\t\t\tti,hwmods = \"tpcc\", \"tptc0\", \"tptc1\", \"tptc2\";\n" "> -\t\t\treg =\t<0x49000000 0x10000>,\n" @@ -178,25 +174,25 @@ "> \t\t\t#dma-cells = <1>;\n" "> \t\t};\n" "> \n" - "> +\t\ttptc0: tptc@49800000 {\n" + "> +\t\ttptc0: tptc at 49800000 {\n" "> +\t\t\tcompatible = \"ti,tptc3\";\n" "> +\t\t\tti,hwmods = \"tptc0\";\n" "> +\t\t\treg = <0x49800000 0x10000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ttptc1: tptc@49900000 {\n" + "> +\t\ttptc1: tptc at 49900000 {\n" "> +\t\t\tcompatible = \"ti,tptc3\";\n" "> +\t\t\tti,hwmods = \"tptc1\";\n" "> +\t\t\treg = <0x49900000 0x10000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ttptc2: tptc@49a00000 {\n" + "> +\t\ttptc2: tptc at 49a00000 {\n" "> +\t\t\tcompatible = \"ti,tptc3\";\n" "> +\t\t\tti,hwmods = \"tptc2\";\n" "> +\t\t\treg = <0x49a00000 0x10000>;\n" "> +\t\t};\n" "> +\n" - "> \t\tgpio0: gpio@44e07000 {\n" + "> \t\tgpio0: gpio at 44e07000 {\n" "> \t\t\tcompatible = \"ti,omap4-gpio\";\n" "> \t\t\tti,hwmods = \"gpio1\";\n" "> \n" @@ -207,4 +203,4 @@ "> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |\n" > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -79d1820d306422f186985a4cc4c3b6be0904e96ab1964a9041fbf0402dd49980 +f09bda6092f30c952331b0053c7e1394fe6befa6f35ab51bacad31f1c9273114
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.