diff for duplicates of <1397668667-27328-2-git-send-email-ynvich@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 500142e..8f0ae90 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -120,36 +120,36 @@ index 0000000..8ddc9f5 + +/ { + extbus { -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 0x04000000>; + bank-width = <4>; + device-width = <2>; + #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>; @@ -187,7 +187,7 @@ index 0000000..38a3e46 + #address-cells = <1>; + #size-cells = <0>; + -+ vmmc: regulator at 0 { ++ vmmc: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vmmc"; @@ -198,29 +198,29 @@ index 0000000..38a3e46 + }; + + pxabus { -+ pxairq: interrupt-controller at 40d00000 { ++ pxairq: interrupt-controller@40d00000 { + marvell,intc-priority; + marvell,intc-nr-irqs = <34>; + }; + -+ uart at 40100000 { ++ uart@40100000 { + status = "okay"; + }; + -+ uart at 40200000 { ++ uart@40200000 { + status = "okay"; + }; + -+ uart at 40700000 { ++ uart@40700000 { + status = "okay"; + }; + -+ mmc at 41100000 { ++ mmc@41100000 { + status = "okay"; + vmmc-supply = <&vmmc>; + }; + -+ ohci at 4c000000 { ++ ohci@4c000000 { + status = "okay"; + marvell,port-mode = <3>; + marvell,oc-mode-perport; @@ -245,7 +245,7 @@ index 0000000..38a3e46 + #address-cells = <1>; + #size-cells = <0>; + -+ eeprom at 50 { ++ eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + pagesize = <64>; @@ -259,50 +259,50 @@ index 0000000..38a3e46 + }; + + extbus { -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 0x02000000>; + bank-width = <4>; + device-width = <2>; + #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>; + device-width = <1>; + }; + -+ 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>; @@ -310,7 +310,7 @@ index 0000000..38a3e46 + status = "okay"; + }; + -+ eth1: eth at 1000000 { ++ eth1: eth@1000000 { + compatible = "davicom,dm9000"; + reg = <0x1000000 0x2 + 0x1004000 0x2>; @@ -319,26 +319,26 @@ index 0000000..38a3e46 + }; + }; + -+ 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>; + }; + -+ fpgairq: irq at 9006 { ++ fpgairq: irq@9006 { + compatible = "icpdas,irq-lp8x4x"; + reg = <0x9006 0x16>; + interrupt-parent = <&gpio>; @@ -348,7 +348,7 @@ index 0000000..38a3e46 + status = "okay"; + }; + -+ uart at 9050 { ++ uart@9050 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9050 0x10 + 0x9030 0x02>; @@ -356,7 +356,7 @@ index 0000000..38a3e46 + status = "okay"; + }; + -+ uart at 9060 { ++ uart@9060 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9060 0x10 + 0x9032 0x02>; @@ -364,7 +364,7 @@ index 0000000..38a3e46 + status = "okay"; + }; + -+ uart at 9070 { ++ uart@9070 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9070 0x10 + 0x9034 0x02>; diff --git a/a/content_digest b/N1/content_digest index 339a142..05ef33c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,31 @@ "ref\01397668411-27162-7-git-send-email-ynvich@gmail.com\0" "ref\01397668667-27328-1-git-send-email-ynvich@gmail.com\0" - "From\0ynvich@gmail.com (Sergei Ianovich)\0" + "From\0Sergei Ianovich <ynvich@gmail.com>\0" "Subject\0[PATCH v4 08/21] ARM: pxa27x: device tree support ICP DAS LP-8x4x\0" "Date\0Wed, 16 Apr 2014 21:17:13 +0400\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-kernel@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Sergei Ianovich <ynvich@gmail.com>" + Daniel Mack <zonque@gmail.com> + 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> + Randy Dunlap <rdunlap@infradead.org> + Russell King <linux@arm.linux.org.uk> + Eric Miao <eric.y.miao@gmail.com> + Haojian Zhuang <haojian.zhuang@gmail.com> + Thierry Reding <thierry.reding@gmail.com> + Florian Vaussard <florian.vaussard@epfl.ch> + Jonathan Cameron <jic23@kernel.org> + Shawn Guo <shawn.guo@linaro.org> + Andrew Lunn <andrew@lunn.ch> + Silvio F <silvio.fricke@gmail.com> + Heikki Krogerus <heikki.krogerus@linux.intel.com> + open list:OPEN FIRMWARE AND... <devicetree@vger.kernel.org> + " open list:DOCUMENTATION <linux-doc@vger.kernel.org>\0" "\00:1\0" "b\0" "ICP DAS calls LP-8x4x 'programmable automation controller'. It is\n" @@ -128,36 +150,36 @@ "+\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" "+\t\t\tdevice-width = <2>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" - "+\t\t\tfs at 0 {\n" + "+\t\t\tfs@0 {\n" "+\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 40000 {\n" + "+\t\t\tfs@40000 {\n" "+\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 80000 {\n" + "+\t\t\tfs@80000 {\n" "+\t\t\t\tlabel = \"device_tree\";\n" "+\t\t\t\treg = <0x80000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at c0000 {\n" + "+\t\t\tfs@c0000 {\n" "+\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\treg = <0xc0000 0x2c0000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 300000 {\n" + "+\t\t\tfs@300000 {\n" "+\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\treg = <0x380000 0x3c80000>;\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" @@ -195,7 +217,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" @@ -206,29 +228,29 @@ "+\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\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\tmmc at 41100000 {\n" + "+\t\tmmc@41100000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t\tvmmc-supply = <&vmmc>;\n" "+\t\t};\n" "+\n" - "+\t\tohci at 4c000000 {\n" + "+\t\tohci@4c000000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t\tmarvell,port-mode = <3>;\n" "+\t\t\tmarvell,oc-mode-perport;\n" @@ -253,7 +275,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" @@ -267,50 +289,50 @@ "+\t};\n" "+\n" "+\textbus {\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" "+\t\t\tdevice-width = <2>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" - "+\t\t\tfs at 0 {\n" + "+\t\t\tfs@0 {\n" "+\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 40000 {\n" + "+\t\t\tfs@40000 {\n" "+\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 80000 {\n" + "+\t\t\tfs@80000 {\n" "+\t\t\t\tlabel = \"device_tree\";\n" "+\t\t\t\treg = <0x80000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at c0000 {\n" + "+\t\t\tfs@c0000 {\n" "+\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\treg = <0xc0000 0x240000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 300000 {\n" + "+\t\t\tfs@300000 {\n" "+\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\treg = <0x300000 0x1d00000>;\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" "+\t\t\tdevice-width = <1>;\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" @@ -318,7 +340,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" @@ -327,26 +349,26 @@ "+\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" "+\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" @@ -356,7 +378,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" @@ -364,7 +386,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" @@ -372,7 +394,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" @@ -710,4 +732,4 @@ "-- \n" 1.8.4.2 -889055153b2929b690cf5a197153924852ff90f714f1ebc289968aefe31264d9 +41b2cb53ad9aaf13dd7319753feddb5267f4e62c61de907c20ac968996ce61a7
diff --git a/a/1.txt b/N2/1.txt index 500142e..8f0ae90 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -120,36 +120,36 @@ index 0000000..8ddc9f5 + +/ { + extbus { -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 0x04000000>; + bank-width = <4>; + device-width = <2>; + #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>; @@ -187,7 +187,7 @@ index 0000000..38a3e46 + #address-cells = <1>; + #size-cells = <0>; + -+ vmmc: regulator at 0 { ++ vmmc: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vmmc"; @@ -198,29 +198,29 @@ index 0000000..38a3e46 + }; + + pxabus { -+ pxairq: interrupt-controller at 40d00000 { ++ pxairq: interrupt-controller@40d00000 { + marvell,intc-priority; + marvell,intc-nr-irqs = <34>; + }; + -+ uart at 40100000 { ++ uart@40100000 { + status = "okay"; + }; + -+ uart at 40200000 { ++ uart@40200000 { + status = "okay"; + }; + -+ uart at 40700000 { ++ uart@40700000 { + status = "okay"; + }; + -+ mmc at 41100000 { ++ mmc@41100000 { + status = "okay"; + vmmc-supply = <&vmmc>; + }; + -+ ohci at 4c000000 { ++ ohci@4c000000 { + status = "okay"; + marvell,port-mode = <3>; + marvell,oc-mode-perport; @@ -245,7 +245,7 @@ index 0000000..38a3e46 + #address-cells = <1>; + #size-cells = <0>; + -+ eeprom at 50 { ++ eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + pagesize = <64>; @@ -259,50 +259,50 @@ index 0000000..38a3e46 + }; + + extbus { -+ flash at 0 { ++ flash@0 { + compatible = "cfi-flash"; + reg = <0 0 0x02000000>; + bank-width = <4>; + device-width = <2>; + #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>; + device-width = <1>; + }; + -+ 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>; @@ -310,7 +310,7 @@ index 0000000..38a3e46 + status = "okay"; + }; + -+ eth1: eth at 1000000 { ++ eth1: eth@1000000 { + compatible = "davicom,dm9000"; + reg = <0x1000000 0x2 + 0x1004000 0x2>; @@ -319,26 +319,26 @@ index 0000000..38a3e46 + }; + }; + -+ 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>; + }; + -+ fpgairq: irq at 9006 { ++ fpgairq: irq@9006 { + compatible = "icpdas,irq-lp8x4x"; + reg = <0x9006 0x16>; + interrupt-parent = <&gpio>; @@ -348,7 +348,7 @@ index 0000000..38a3e46 + status = "okay"; + }; + -+ uart at 9050 { ++ uart@9050 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9050 0x10 + 0x9030 0x02>; @@ -356,7 +356,7 @@ index 0000000..38a3e46 + status = "okay"; + }; + -+ uart at 9060 { ++ uart@9060 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9060 0x10 + 0x9032 0x02>; @@ -364,7 +364,7 @@ index 0000000..38a3e46 + 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 339a142..975ba78 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,31 @@ "ref\01397668411-27162-7-git-send-email-ynvich@gmail.com\0" "ref\01397668667-27328-1-git-send-email-ynvich@gmail.com\0" - "From\0ynvich@gmail.com (Sergei Ianovich)\0" + "From\0Sergei Ianovich <ynvich@gmail.com>\0" "Subject\0[PATCH v4 08/21] ARM: pxa27x: device tree support ICP DAS LP-8x4x\0" "Date\0Wed, 16 Apr 2014 21:17:13 +0400\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-kernel@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Sergei Ianovich <ynvich@gmail.com>" + Daniel Mack <zonque@gmail.com> + 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> + Randy Dunlap <rdunlap@infradead.org> + Russell King <linux@arm.linux.org.uk> + Eric Miao <eric.y.miao@gmail.com> + Haojian Zhuang <haojian.zhuang@gmail.com> + Thierry Reding <thierry.reding@gmail.com> + Florian Vaussard <florian.vaussard@epfl.ch> + Jonathan Cameron <jic23@kernel.org> + Shawn Guo <shawn.guo@linaro.org> + Andrew Lunn <andrew@lunn.ch> + Silvio F <silvio.fricke@gmail.com> + Heikki Krogerus <heikki.krogerus@linux.intel.com> + devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND...) + " linux-doc@vger.kernel.org (open list:DOCUMENTATION)\0" "\00:1\0" "b\0" "ICP DAS calls LP-8x4x 'programmable automation controller'. It is\n" @@ -128,36 +150,36 @@ "+\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" "+\t\t\tdevice-width = <2>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" - "+\t\t\tfs at 0 {\n" + "+\t\t\tfs@0 {\n" "+\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 40000 {\n" + "+\t\t\tfs@40000 {\n" "+\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 80000 {\n" + "+\t\t\tfs@80000 {\n" "+\t\t\t\tlabel = \"device_tree\";\n" "+\t\t\t\treg = <0x80000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at c0000 {\n" + "+\t\t\tfs@c0000 {\n" "+\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\treg = <0xc0000 0x2c0000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 300000 {\n" + "+\t\t\tfs@300000 {\n" "+\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\treg = <0x380000 0x3c80000>;\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" @@ -195,7 +217,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" @@ -206,29 +228,29 @@ "+\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\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\tmmc at 41100000 {\n" + "+\t\tmmc@41100000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t\tvmmc-supply = <&vmmc>;\n" "+\t\t};\n" "+\n" - "+\t\tohci at 4c000000 {\n" + "+\t\tohci@4c000000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t\tmarvell,port-mode = <3>;\n" "+\t\t\tmarvell,oc-mode-perport;\n" @@ -253,7 +275,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" @@ -267,50 +289,50 @@ "+\t};\n" "+\n" "+\textbus {\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" "+\t\t\tdevice-width = <2>;\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" - "+\t\t\tfs at 0 {\n" + "+\t\t\tfs@0 {\n" "+\t\t\t\tlabel = \"u-boot\";\n" "+\t\t\t\treg = <0 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 40000 {\n" + "+\t\t\tfs@40000 {\n" "+\t\t\t\tlabel = \"settings\";\n" "+\t\t\t\treg = <0x40000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 80000 {\n" + "+\t\t\tfs@80000 {\n" "+\t\t\t\tlabel = \"device_tree\";\n" "+\t\t\t\treg = <0x80000 0x40000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at c0000 {\n" + "+\t\t\tfs@c0000 {\n" "+\t\t\t\tlabel = \"kernel\";\n" "+\t\t\t\treg = <0xc0000 0x240000>;\n" "+\t\t\t};\n" - "+\t\t\tfs at 300000 {\n" + "+\t\t\tfs@300000 {\n" "+\t\t\t\tlabel = \"root_fs\";\n" "+\t\t\t\treg = <0x300000 0x1d00000>;\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" "+\t\t\tdevice-width = <1>;\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" @@ -318,7 +340,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" @@ -327,26 +349,26 @@ "+\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" "+\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" @@ -356,7 +378,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" @@ -364,7 +386,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" @@ -372,7 +394,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" @@ -710,4 +732,4 @@ "-- \n" 1.8.4.2 -889055153b2929b690cf5a197153924852ff90f714f1ebc289968aefe31264d9 +532ab95958099c3163b3170d72da172ecc50b8e71b8fb14add13365a7b2ba387
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.