diff for duplicates of <1450196875-6739-1-git-send-email-ynvich@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 968265c..0a683c9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,11 +41,11 @@ partition structure otherwise being the same. When each device is provided with a correct device tree, all of them can be booted using the same kernel. -Signed-off-by: Sergei Ianovich <ynvich@gmail.com> -Acked-by: Rob Herring <robh@kernel.org> -CC: Daniel Mack <zonque@gmail.com> -CC: Robert Jarzmik <robert.jarzmik@free.fr> -CC: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Sergei Ianovich <ynvich-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +CC: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +CC: Robert Jarzmik <robert.jarzmik-GANU6spQydw@public.gmane.org> +CC: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> --- v4..v5 fixes to apply Rob Herring's "Acked-by": @@ -123,7 +123,7 @@ index 0000000..903f5c7 + +/ { + extbus { -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 0x04000000>; + bank-width = <4>; @@ -132,30 +132,30 @@ index 0000000..903f5c7 + partitions { + #address-cells = <1>; + #size-cells = <1>; -+ fs at 0 { ++ fs@0 { + label = "u-boot"; + reg = <0 0x40000>; + }; -+ fs at 40000 { ++ fs@40000 { + label = "settings"; + reg = <0x40000 0x40000>; + }; -+ fs at 80000 { ++ fs@80000 { + label = "device_tree"; + reg = <0x80000 0x40000>; + }; -+ fs at c0000 { ++ fs@c0000 { + label = "kernel"; + reg = <0xc0000 0x2c0000>; + }; -+ fs at 300000 { ++ fs@300000 { + label = "root_fs"; + reg = <0x380000 0x3c80000>; + }; + }; + }; + -+ flash at 1 { ++ flash@1 { + compatible = "cfi-flash"; + reg = <1 0x0 0x02000000>; + bank-width = <2>; @@ -196,7 +196,7 @@ index 0000000..7f33912c + #address-cells = <1>; + #size-cells = <0>; + -+ vmmc: regulator at 0 { ++ vmmc: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vmmc"; @@ -207,34 +207,34 @@ index 0000000..7f33912c + }; + + pxabus { -+ pxairq: interrupt-controller at 40d00000 { ++ pxairq: interrupt-controller@40d00000 { + marvell,intc-priority; + marvell,intc-nr-irqs = <34>; + }; + -+ gpio: gpio at 40e00000 { ++ gpio: gpio@40e00000 { + interrupts = <8>, <9>, <10>; + interrupt-names = "gpio0", "gpio1", "gpio_mux"; + }; + -+ uart at 40100000 { ++ uart@40100000 { + status = "okay"; + }; + -+ uart at 40200000 { ++ uart@40200000 { + status = "okay"; + }; + -+ uart at 40700000 { ++ uart@40700000 { + status = "okay"; + }; + -+ mmc0: mmc at 41100000 { ++ mmc0: mmc@41100000 { + vmmc-supply = <&vmmc>; + status = "okay"; + }; + -+ usb0: ohci at 4c000000 { ++ usb0: ohci@4c000000 { + marvell,port-mode = <3>; + marvell,oc-mode-perport; + marvell,enable-port1; @@ -259,7 +259,7 @@ index 0000000..7f33912c + #address-cells = <1>; + #size-cells = <0>; + -+ eeprom at 50 { ++ eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + pagesize = <64>; @@ -288,7 +288,7 @@ index 0000000..7f33912c + 4 0 0x10000000 0x04000000 + 5 0 0x14000000 0x04000000>; + -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 0x02000000>; + bank-width = <4>; @@ -297,30 +297,30 @@ index 0000000..7f33912c + partitions { + #address-cells = <1>; + #size-cells = <1>; -+ fs at 0 { ++ fs@0 { + label = "u-boot"; + reg = <0 0x40000>; + }; -+ fs at 40000 { ++ fs@40000 { + label = "settings"; + reg = <0x40000 0x40000>; + }; -+ fs at 80000 { ++ fs@80000 { + label = "device_tree"; + reg = <0x80000 0x40000>; + }; -+ fs at c0000 { ++ fs@c0000 { + label = "kernel"; + reg = <0xc0000 0x240000>; + }; -+ fs at 300000 { ++ fs@300000 { + label = "root_fs"; + reg = <0x300000 0x1d00000>; + }; + }; + }; + -+ flash at 1 { ++ flash@1 { + compatible = "cfi-flash"; + reg = <1 0x0 0x01000000>; + bank-width = <2>; @@ -331,14 +331,14 @@ index 0000000..7f33912c + }; + }; + -+ netio at 3 { ++ netio@3 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 3 0 0x02000000>; + interrupt-parent = <&gpio>; + -+ eth0: eth at 0 { ++ eth0: eth@0 { + compatible = "davicom,dm9000"; + reg = <0x0 0x2 + 0x4000 0x2>; @@ -346,7 +346,7 @@ index 0000000..7f33912c + status = "okay"; + }; + -+ eth1: eth at 1000000 { ++ eth1: eth@1000000 { + compatible = "davicom,dm9000"; + reg = <0x1000000 0x2 + 0x1004000 0x2>; @@ -355,20 +355,20 @@ index 0000000..7f33912c + }; + }; + -+ fpga at 5 { ++ fpga@5 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 5 0x3000000 0x10000>; + interrupt-parent = <&fpgairq>; + -+ rtc at 901c { ++ rtc@901c { + compatible = "dallas,rtc-ds1302"; + reg = <0x901c 0x1>; + status = "okay"; + }; + -+ sram at a000 { ++ sram@a000 { + compatible = "icpdas,sram-lp8x4x"; + reg = <0xa000 0x1000 + 0x901e 0x1>; @@ -379,7 +379,7 @@ index 0000000..7f33912c + }; + }; + -+ fpgairq: irq at 9006 { ++ fpgairq: irq@9006 { + compatible = "icpdas,irq-lp8x4x"; + reg = <0x9006 0x16>; + interrupt-parent = <&gpio>; @@ -389,7 +389,7 @@ index 0000000..7f33912c + status = "okay"; + }; + -+ uart at 9050 { ++ uart@9050 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9050 0x10 + 0x9030 0x02>; @@ -397,7 +397,7 @@ index 0000000..7f33912c + status = "okay"; + }; + -+ uart at 9060 { ++ uart@9060 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9060 0x10 + 0x9032 0x02>; @@ -405,7 +405,7 @@ index 0000000..7f33912c + status = "okay"; + }; + -+ uart at 9070 { ++ uart@9070 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9070 0x10 + 0x9034 0x02>; @@ -616,3 +616,8 @@ index 0000000..0eb87df +CONFIG_PRINTK_TIME=y -- 2.6.2 + +-- +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 035665b..b6f5dac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,27 @@ "ref\01449700088-28076-3-git-send-email-ynvich@gmail.com\0" - "From\0ynvich@gmail.com (Sergei Ianovich)\0" + "ref\01449700088-28076-3-git-send-email-ynvich-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Sergei Ianovich <ynvich-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Subject\0[PATCH v5 2/2] arm: pxa27x: support for ICP DAS LP-8x4x w/ DT\0" "Date\0Tue, 15 Dec 2015 19:27:50 +0300\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Cc\0Sergei Ianovich <ynvich-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" + Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + Robert Jarzmik <robert.jarzmik-GANU6spQydw@public.gmane.org> + Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> + Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> + Arnaud Ebalard <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org> + Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org> + open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " moderated list:ARM PORT <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" "\00:1\0" "b\0" "ICP DAS calls LP-8x4x 'programmable automation controller'. It is\n" @@ -48,11 +67,11 @@ "is provided with a correct device tree, all of them can be booted\n" "using the same kernel.\n" "\n" - "Signed-off-by: Sergei Ianovich <ynvich@gmail.com>\n" - "Acked-by: Rob Herring <robh@kernel.org>\n" - "CC: Daniel Mack <zonque@gmail.com>\n" - "CC: Robert Jarzmik <robert.jarzmik@free.fr>\n" - "CC: Arnd Bergmann <arnd@arndb.de>\n" + "Signed-off-by: Sergei Ianovich <ynvich-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + "CC: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "CC: Robert Jarzmik <robert.jarzmik-GANU6spQydw@public.gmane.org>\n" + "CC: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\n" "---\n" " v4..v5\n" " fixes to apply Rob Herring's \"Acked-by\":\n" @@ -130,7 +149,7 @@ "+\n" "+/ {\n" "+\textbus {\n" - "+\t\tflash at 0 {\n" + "+\t\tflash@0 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <0 0 0x04000000>;\n" "+\t\t\tbank-width = <4>;\n" @@ -139,30 +158,30 @@ "+\t\t\tpartitions {\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <1>;\n" - "+\t\t\t\tfs at 0 {\n" + "+\t\t\t\tfs@0 {\n" "+\t\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 40000 {\n" + "+\t\t\t\tfs@40000 {\n" "+\t\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 80000 {\n" + "+\t\t\t\tfs@80000 {\n" "+\t\t\t\t\tlabel = \"device_tree\";\n" "+\t\t\t\t\treg = <0x80000 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at c0000 {\n" + "+\t\t\t\tfs@c0000 {\n" "+\t\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\t\treg = <0xc0000 0x2c0000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 300000 {\n" + "+\t\t\t\tfs@300000 {\n" "+\t\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\t\treg = <0x380000 0x3c80000>;\n" "+\t\t\t\t};\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tflash at 1 {\n" + "+\t\tflash@1 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <1 0x0 0x02000000>;\n" "+\t\t\tbank-width = <2>;\n" @@ -203,7 +222,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tvmmc: regulator at 0 {\n" + "+\t\tvmmc: regulator@0 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <0>;\n" "+\t\t\tregulator-name = \"vmmc\";\n" @@ -214,34 +233,34 @@ "+\t};\n" "+\n" "+\tpxabus {\n" - "+\t\tpxairq: interrupt-controller at 40d00000 {\n" + "+\t\tpxairq: interrupt-controller@40d00000 {\n" "+\t\t\tmarvell,intc-priority;\n" "+\t\t\tmarvell,intc-nr-irqs = <34>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio: gpio at 40e00000 {\n" + "+\t\tgpio: gpio@40e00000 {\n" "+\t\t\tinterrupts = <8>, <9>, <10>;\n" "+\t\t\tinterrupt-names = \"gpio0\", \"gpio1\", \"gpio_mux\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40100000 {\n" + "+\t\tuart@40100000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40200000 {\n" + "+\t\tuart@40200000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40700000 {\n" + "+\t\tuart@40700000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tmmc0: mmc at 41100000 {\n" + "+\t\tmmc0: mmc@41100000 {\n" "+\t\t\tvmmc-supply = <&vmmc>;\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tusb0: ohci at 4c000000 {\n" + "+\t\tusb0: ohci@4c000000 {\n" "+\t\t\tmarvell,port-mode = <3>;\n" "+\t\t\tmarvell,oc-mode-perport;\n" "+\t\t\tmarvell,enable-port1;\n" @@ -266,7 +285,7 @@ "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\teeprom at 50 {\n" + "+\t\t\teeprom@50 {\n" "+\t\t\t\tcompatible = \"atmel,24c128\";\n" "+\t\t\t\treg = <0x50>;\n" "+\t\t\t\tpagesize = <64>;\n" @@ -295,7 +314,7 @@ "+\t\t\t 4 0 0x10000000 0x04000000\n" "+\t\t\t 5 0 0x14000000 0x04000000>;\n" "+\n" - "+\t\tflash at 0 {\n" + "+\t\tflash@0 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <0 0 0x02000000>;\n" "+\t\t\tbank-width = <4>;\n" @@ -304,30 +323,30 @@ "+\t\t\tpartitions {\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <1>;\n" - "+\t\t\t\tfs at 0 {\n" + "+\t\t\t\tfs@0 {\n" "+\t\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 40000 {\n" + "+\t\t\t\tfs@40000 {\n" "+\t\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 80000 {\n" + "+\t\t\t\tfs@80000 {\n" "+\t\t\t\t\tlabel = \"device_tree\";\n" "+\t\t\t\t\treg = <0x80000 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at c0000 {\n" + "+\t\t\t\tfs@c0000 {\n" "+\t\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\t\treg = <0xc0000 0x240000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 300000 {\n" + "+\t\t\t\tfs@300000 {\n" "+\t\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\t\treg = <0x300000 0x1d00000>;\n" "+\t\t\t\t};\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tflash at 1 {\n" + "+\t\tflash@1 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <1 0x0 0x01000000>;\n" "+\t\t\tbank-width = <2>;\n" @@ -338,14 +357,14 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tnetio at 3 {\n" + "+\t\tnetio@3 {\n" "+\t\t\tcompatible = \"simple-bus\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges = <0 3 0 0x02000000>;\n" "+\t\t\tinterrupt-parent = <&gpio>;\n" "+\n" - "+\t\t\teth0: eth at 0 {\n" + "+\t\t\teth0: eth@0 {\n" "+\t\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\t\treg = <0x0 0x2\n" "+\t\t\t\t 0x4000 0x2>;\n" @@ -353,7 +372,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\teth1: eth at 1000000 {\n" + "+\t\t\teth1: eth@1000000 {\n" "+\t\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\t\treg = <0x1000000 0x2\n" "+\t\t\t\t 0x1004000 0x2>;\n" @@ -362,20 +381,20 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tfpga at 5 {\n" + "+\t\tfpga@5 {\n" "+\t\t\tcompatible = \"simple-bus\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges = <0 5 0x3000000 0x10000>;\n" "+\t\t\tinterrupt-parent = <&fpgairq>;\n" "+\n" - "+\t\t\trtc at 901c {\n" + "+\t\t\trtc@901c {\n" "+\t\t\t\tcompatible = \"dallas,rtc-ds1302\";\n" "+\t\t\t\treg = <0x901c 0x1>;\n" "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tsram at a000 {\n" + "+\t\t\tsram@a000 {\n" "+\t\t\t\tcompatible = \"icpdas,sram-lp8x4x\";\n" "+\t\t\t\treg = <0xa000 0x1000\n" "+\t\t\t\t 0x901e 0x1>;\n" @@ -386,7 +405,7 @@ "+\t\t\t\t};\n" "+\t\t\t};\n" "+\n" - "+\t\t\tfpgairq: irq at 9006 {\n" + "+\t\t\tfpgairq: irq@9006 {\n" "+\t\t\t\tcompatible = \"icpdas,irq-lp8x4x\";\n" "+\t\t\t\treg = <0x9006 0x16>;\n" "+\t\t\t\tinterrupt-parent = <&gpio>;\n" @@ -396,7 +415,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart at 9050 {\n" + "+\t\t\tuart@9050 {\n" "+\t\t\t\tcompatible = \"icpdas,uart-lp8x4x\";\n" "+\t\t\t\treg = <0x9050 0x10\n" "+\t\t\t\t 0x9030 0x02>;\n" @@ -404,7 +423,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart at 9060 {\n" + "+\t\t\tuart@9060 {\n" "+\t\t\t\tcompatible = \"icpdas,uart-lp8x4x\";\n" "+\t\t\t\treg = <0x9060 0x10\n" "+\t\t\t\t 0x9032 0x02>;\n" @@ -412,7 +431,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart at 9070 {\n" + "+\t\t\tuart@9070 {\n" "+\t\t\t\tcompatible = \"icpdas,uart-lp8x4x\";\n" "+\t\t\t\treg = <0x9070 0x10\n" "+\t\t\t\t 0x9034 0x02>;\n" @@ -622,6 +641,11 @@ "+CONFIG_NLS_UTF8=y\n" "+CONFIG_PRINTK_TIME=y\n" "-- \n" - 2.6.2 + "2.6.2\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 -ea38d7fe8e8f77a8f781ffc23601a52990173d5535612dc4efe5ac5f6713d229 +ffc6816e784d86465bc6dfc26781892f233e2d6c524f56e214169d302499cbd3
diff --git a/a/1.txt b/N2/1.txt index 968265c..e9dd8ea 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -123,7 +123,7 @@ index 0000000..903f5c7 + +/ { + extbus { -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 0x04000000>; + bank-width = <4>; @@ -132,30 +132,30 @@ index 0000000..903f5c7 + partitions { + #address-cells = <1>; + #size-cells = <1>; -+ fs at 0 { ++ fs@0 { + label = "u-boot"; + reg = <0 0x40000>; + }; -+ fs at 40000 { ++ fs@40000 { + label = "settings"; + reg = <0x40000 0x40000>; + }; -+ fs at 80000 { ++ fs@80000 { + label = "device_tree"; + reg = <0x80000 0x40000>; + }; -+ fs at c0000 { ++ fs@c0000 { + label = "kernel"; + reg = <0xc0000 0x2c0000>; + }; -+ fs at 300000 { ++ fs@300000 { + label = "root_fs"; + reg = <0x380000 0x3c80000>; + }; + }; + }; + -+ flash at 1 { ++ flash@1 { + compatible = "cfi-flash"; + reg = <1 0x0 0x02000000>; + bank-width = <2>; @@ -196,7 +196,7 @@ index 0000000..7f33912c + #address-cells = <1>; + #size-cells = <0>; + -+ vmmc: regulator at 0 { ++ vmmc: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vmmc"; @@ -207,34 +207,34 @@ index 0000000..7f33912c + }; + + pxabus { -+ pxairq: interrupt-controller at 40d00000 { ++ pxairq: interrupt-controller@40d00000 { + marvell,intc-priority; + marvell,intc-nr-irqs = <34>; + }; + -+ gpio: gpio at 40e00000 { ++ gpio: gpio@40e00000 { + interrupts = <8>, <9>, <10>; + interrupt-names = "gpio0", "gpio1", "gpio_mux"; + }; + -+ uart at 40100000 { ++ uart@40100000 { + status = "okay"; + }; + -+ uart at 40200000 { ++ uart@40200000 { + status = "okay"; + }; + -+ uart at 40700000 { ++ uart@40700000 { + status = "okay"; + }; + -+ mmc0: mmc at 41100000 { ++ mmc0: mmc@41100000 { + vmmc-supply = <&vmmc>; + status = "okay"; + }; + -+ usb0: ohci at 4c000000 { ++ usb0: ohci@4c000000 { + marvell,port-mode = <3>; + marvell,oc-mode-perport; + marvell,enable-port1; @@ -259,7 +259,7 @@ index 0000000..7f33912c + #address-cells = <1>; + #size-cells = <0>; + -+ eeprom at 50 { ++ eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + pagesize = <64>; @@ -288,7 +288,7 @@ index 0000000..7f33912c + 4 0 0x10000000 0x04000000 + 5 0 0x14000000 0x04000000>; + -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 0x02000000>; + bank-width = <4>; @@ -297,30 +297,30 @@ index 0000000..7f33912c + partitions { + #address-cells = <1>; + #size-cells = <1>; -+ fs at 0 { ++ fs@0 { + label = "u-boot"; + reg = <0 0x40000>; + }; -+ fs at 40000 { ++ fs@40000 { + label = "settings"; + reg = <0x40000 0x40000>; + }; -+ fs at 80000 { ++ fs@80000 { + label = "device_tree"; + reg = <0x80000 0x40000>; + }; -+ fs at c0000 { ++ fs@c0000 { + label = "kernel"; + reg = <0xc0000 0x240000>; + }; -+ fs at 300000 { ++ fs@300000 { + label = "root_fs"; + reg = <0x300000 0x1d00000>; + }; + }; + }; + -+ flash at 1 { ++ flash@1 { + compatible = "cfi-flash"; + reg = <1 0x0 0x01000000>; + bank-width = <2>; @@ -331,14 +331,14 @@ index 0000000..7f33912c + }; + }; + -+ netio at 3 { ++ netio@3 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 3 0 0x02000000>; + interrupt-parent = <&gpio>; + -+ eth0: eth at 0 { ++ eth0: eth@0 { + compatible = "davicom,dm9000"; + reg = <0x0 0x2 + 0x4000 0x2>; @@ -346,7 +346,7 @@ index 0000000..7f33912c + status = "okay"; + }; + -+ eth1: eth at 1000000 { ++ eth1: eth@1000000 { + compatible = "davicom,dm9000"; + reg = <0x1000000 0x2 + 0x1004000 0x2>; @@ -355,20 +355,20 @@ index 0000000..7f33912c + }; + }; + -+ fpga at 5 { ++ fpga@5 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 5 0x3000000 0x10000>; + interrupt-parent = <&fpgairq>; + -+ rtc at 901c { ++ rtc@901c { + compatible = "dallas,rtc-ds1302"; + reg = <0x901c 0x1>; + status = "okay"; + }; + -+ sram at a000 { ++ sram@a000 { + compatible = "icpdas,sram-lp8x4x"; + reg = <0xa000 0x1000 + 0x901e 0x1>; @@ -379,7 +379,7 @@ index 0000000..7f33912c + }; + }; + -+ fpgairq: irq at 9006 { ++ fpgairq: irq@9006 { + compatible = "icpdas,irq-lp8x4x"; + reg = <0x9006 0x16>; + interrupt-parent = <&gpio>; @@ -389,7 +389,7 @@ index 0000000..7f33912c + status = "okay"; + }; + -+ uart at 9050 { ++ uart@9050 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9050 0x10 + 0x9030 0x02>; @@ -397,7 +397,7 @@ index 0000000..7f33912c + status = "okay"; + }; + -+ uart at 9060 { ++ uart@9060 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9060 0x10 + 0x9032 0x02>; @@ -405,7 +405,7 @@ index 0000000..7f33912c + status = "okay"; + }; + -+ uart at 9070 { ++ uart@9070 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9070 0x10 + 0x9034 0x02>; diff --git a/a/content_digest b/N2/content_digest index 035665b..3dcf19b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,26 @@ "ref\01449700088-28076-3-git-send-email-ynvich@gmail.com\0" - "From\0ynvich@gmail.com (Sergei Ianovich)\0" + "From\0Sergei Ianovich <ynvich@gmail.com>\0" "Subject\0[PATCH v5 2/2] arm: pxa27x: support for ICP DAS LP-8x4x w/ DT\0" "Date\0Tue, 15 Dec 2015 19:27:50 +0300\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0Sergei Ianovich <ynvich@gmail.com>" + Daniel Mack <zonque@gmail.com> + Robert Jarzmik <robert.jarzmik@free.fr> + Arnd Bergmann <arnd@arndb.de> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Russell King <linux@arm.linux.org.uk> + Thierry Reding <treding@nvidia.com> + Jonathan Cameron <jic23@kernel.org> + Dmitry Torokhov <dmitry.torokhov@gmail.com> + Philipp Zabel <p.zabel@pengutronix.de> + Arnaud Ebalard <arno@natisbad.org> + Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> + devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS) + " linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT)\0" "\00:1\0" "b\0" "ICP DAS calls LP-8x4x 'programmable automation controller'. It is\n" @@ -130,7 +148,7 @@ "+\n" "+/ {\n" "+\textbus {\n" - "+\t\tflash at 0 {\n" + "+\t\tflash@0 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <0 0 0x04000000>;\n" "+\t\t\tbank-width = <4>;\n" @@ -139,30 +157,30 @@ "+\t\t\tpartitions {\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <1>;\n" - "+\t\t\t\tfs at 0 {\n" + "+\t\t\t\tfs@0 {\n" "+\t\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 40000 {\n" + "+\t\t\t\tfs@40000 {\n" "+\t\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 80000 {\n" + "+\t\t\t\tfs@80000 {\n" "+\t\t\t\t\tlabel = \"device_tree\";\n" "+\t\t\t\t\treg = <0x80000 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at c0000 {\n" + "+\t\t\t\tfs@c0000 {\n" "+\t\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\t\treg = <0xc0000 0x2c0000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 300000 {\n" + "+\t\t\t\tfs@300000 {\n" "+\t\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\t\treg = <0x380000 0x3c80000>;\n" "+\t\t\t\t};\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tflash at 1 {\n" + "+\t\tflash@1 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <1 0x0 0x02000000>;\n" "+\t\t\tbank-width = <2>;\n" @@ -203,7 +221,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tvmmc: regulator at 0 {\n" + "+\t\tvmmc: regulator@0 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <0>;\n" "+\t\t\tregulator-name = \"vmmc\";\n" @@ -214,34 +232,34 @@ "+\t};\n" "+\n" "+\tpxabus {\n" - "+\t\tpxairq: interrupt-controller at 40d00000 {\n" + "+\t\tpxairq: interrupt-controller@40d00000 {\n" "+\t\t\tmarvell,intc-priority;\n" "+\t\t\tmarvell,intc-nr-irqs = <34>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio: gpio at 40e00000 {\n" + "+\t\tgpio: gpio@40e00000 {\n" "+\t\t\tinterrupts = <8>, <9>, <10>;\n" "+\t\t\tinterrupt-names = \"gpio0\", \"gpio1\", \"gpio_mux\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40100000 {\n" + "+\t\tuart@40100000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40200000 {\n" + "+\t\tuart@40200000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tuart at 40700000 {\n" + "+\t\tuart@40700000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tmmc0: mmc at 41100000 {\n" + "+\t\tmmc0: mmc@41100000 {\n" "+\t\t\tvmmc-supply = <&vmmc>;\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tusb0: ohci at 4c000000 {\n" + "+\t\tusb0: ohci@4c000000 {\n" "+\t\t\tmarvell,port-mode = <3>;\n" "+\t\t\tmarvell,oc-mode-perport;\n" "+\t\t\tmarvell,enable-port1;\n" @@ -266,7 +284,7 @@ "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\teeprom at 50 {\n" + "+\t\t\teeprom@50 {\n" "+\t\t\t\tcompatible = \"atmel,24c128\";\n" "+\t\t\t\treg = <0x50>;\n" "+\t\t\t\tpagesize = <64>;\n" @@ -295,7 +313,7 @@ "+\t\t\t 4 0 0x10000000 0x04000000\n" "+\t\t\t 5 0 0x14000000 0x04000000>;\n" "+\n" - "+\t\tflash at 0 {\n" + "+\t\tflash@0 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <0 0 0x02000000>;\n" "+\t\t\tbank-width = <4>;\n" @@ -304,30 +322,30 @@ "+\t\t\tpartitions {\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <1>;\n" - "+\t\t\t\tfs at 0 {\n" + "+\t\t\t\tfs@0 {\n" "+\t\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 40000 {\n" + "+\t\t\t\tfs@40000 {\n" "+\t\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 80000 {\n" + "+\t\t\t\tfs@80000 {\n" "+\t\t\t\t\tlabel = \"device_tree\";\n" "+\t\t\t\t\treg = <0x80000 0x40000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at c0000 {\n" + "+\t\t\t\tfs@c0000 {\n" "+\t\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\t\treg = <0xc0000 0x240000>;\n" "+\t\t\t\t};\n" - "+\t\t\t\tfs at 300000 {\n" + "+\t\t\t\tfs@300000 {\n" "+\t\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\t\treg = <0x300000 0x1d00000>;\n" "+\t\t\t\t};\n" "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tflash at 1 {\n" + "+\t\tflash@1 {\n" "+\t\t\tcompatible = \"cfi-flash\";\n" "+\t\t\treg = <1 0x0 0x01000000>;\n" "+\t\t\tbank-width = <2>;\n" @@ -338,14 +356,14 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tnetio at 3 {\n" + "+\t\tnetio@3 {\n" "+\t\t\tcompatible = \"simple-bus\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges = <0 3 0 0x02000000>;\n" "+\t\t\tinterrupt-parent = <&gpio>;\n" "+\n" - "+\t\t\teth0: eth at 0 {\n" + "+\t\t\teth0: eth@0 {\n" "+\t\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\t\treg = <0x0 0x2\n" "+\t\t\t\t 0x4000 0x2>;\n" @@ -353,7 +371,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\teth1: eth at 1000000 {\n" + "+\t\t\teth1: eth@1000000 {\n" "+\t\t\t\tcompatible = \"davicom,dm9000\";\n" "+\t\t\t\treg = <0x1000000 0x2\n" "+\t\t\t\t 0x1004000 0x2>;\n" @@ -362,20 +380,20 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - "+\t\tfpga at 5 {\n" + "+\t\tfpga@5 {\n" "+\t\t\tcompatible = \"simple-bus\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\t\t\tranges = <0 5 0x3000000 0x10000>;\n" "+\t\t\tinterrupt-parent = <&fpgairq>;\n" "+\n" - "+\t\t\trtc at 901c {\n" + "+\t\t\trtc@901c {\n" "+\t\t\t\tcompatible = \"dallas,rtc-ds1302\";\n" "+\t\t\t\treg = <0x901c 0x1>;\n" "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tsram at a000 {\n" + "+\t\t\tsram@a000 {\n" "+\t\t\t\tcompatible = \"icpdas,sram-lp8x4x\";\n" "+\t\t\t\treg = <0xa000 0x1000\n" "+\t\t\t\t 0x901e 0x1>;\n" @@ -386,7 +404,7 @@ "+\t\t\t\t};\n" "+\t\t\t};\n" "+\n" - "+\t\t\tfpgairq: irq at 9006 {\n" + "+\t\t\tfpgairq: irq@9006 {\n" "+\t\t\t\tcompatible = \"icpdas,irq-lp8x4x\";\n" "+\t\t\t\treg = <0x9006 0x16>;\n" "+\t\t\t\tinterrupt-parent = <&gpio>;\n" @@ -396,7 +414,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart at 9050 {\n" + "+\t\t\tuart@9050 {\n" "+\t\t\t\tcompatible = \"icpdas,uart-lp8x4x\";\n" "+\t\t\t\treg = <0x9050 0x10\n" "+\t\t\t\t 0x9030 0x02>;\n" @@ -404,7 +422,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart at 9060 {\n" + "+\t\t\tuart@9060 {\n" "+\t\t\t\tcompatible = \"icpdas,uart-lp8x4x\";\n" "+\t\t\t\treg = <0x9060 0x10\n" "+\t\t\t\t 0x9032 0x02>;\n" @@ -412,7 +430,7 @@ "+\t\t\t\tstatus = \"okay\";\n" "+\t\t\t};\n" "+\n" - "+\t\t\tuart at 9070 {\n" + "+\t\t\tuart@9070 {\n" "+\t\t\t\tcompatible = \"icpdas,uart-lp8x4x\";\n" "+\t\t\t\treg = <0x9070 0x10\n" "+\t\t\t\t 0x9034 0x02>;\n" @@ -624,4 +642,4 @@ "-- \n" 2.6.2 -ea38d7fe8e8f77a8f781ffc23601a52990173d5535612dc4efe5ac5f6713d229 +aade6ee2c20f763df7305fce2e39117bfcbb661ad10589e8fb51574afd0da161
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.