diff for duplicates of <87wpdgwj72.fsf@free-electrons.com> diff --git a/a/content_digest b/N1/content_digest index 3c1defc..836088a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,28 +5,28 @@ "To\0Stephen Boyd <sboyd@codeaurora.org>" Linus Walleij <linus.walleij@linaro.org> " Chris Packham <chris.packham@alliedtelesis.co.nz>\0" - "Cc\0linux@armlinux.org.uk" - linux-arm-kernel@lists.infradead.org - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Michael Turquette <mturquette@baylibre.com> - Jason Cooper <jason@lakedaemon.net> + "Cc\0Mark Rutland <mark.rutland@arm.com>" Andrew Lunn <andrew@lunn.ch> - Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Geert Uytterhoeven <geert+renesas@glider.be> - Chris Brand <chris.brand@broadcom.com> + Michael Turquette <mturquette@baylibre.com> + Laxman Dewangan <ldewangan@nvidia.com> + linux-clk@vger.kernel.org Florian Fainelli <f.fainelli@gmail.com> - Arnd Bergmann <arnd@arndb.de> - Thierry Reding <treding@nvidia.com> - Sudeep Holla <sudeep.holla@arm.com> Juri Lelli <juri.lelli@arm.com> + linux@armlinux.org.uk + Thierry Reding <treding@nvidia.com> + Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> + devicetree@vger.kernel.org + Jason Cooper <jason@lakedaemon.net> + Arnd Bergmann <arnd@arndb.de> + linux-gpio@vger.kernel.org + Rob Herring <robh+dt@kernel.org> + Chris Brand <chris.brand@broadcom.com> + linux-arm-kernel@lists.infradead.org Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - Laxman Dewangan <ldewangan@nvidia.com> Kalyan Kinthada <kalyan.kinthada@alliedtelesis.co.nz> - devicetree@vger.kernel.org linux-kernel@vger.kernel.org - linux-clk@vger.kernel.org - " linux-gpio@vger.kernel.org\0" + " Sudeep Holla <sudeep.holla@arm.com>\0" "\00:1\0" "b\0" "Hi all,\n" @@ -884,4 +884,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -70a0ae38e80d91ca11f1acbade7337175452d7a753b31f59e64f2fe8a9b845b0 +1786946c50eb8c9a3d54b6dbd8679302b471b811d0b8fdf971541b92a2bd9fa8
diff --git a/a/1.txt b/N2/1.txt index ad0ad17..00ed348 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -417,7 +417,7 @@ Gregory > ++ * 98DX3236 has 1 x1 PCIe unit Gen2.0 > + */ > -+ pcie-controller { -> ++ pciec: pcie-controller@82000000 { +> ++ pciec: pcie-controller at 82000000 { > + compatible = "marvell,armada-xp-pcie"; > + status = "disabled"; > + device_type = "pci"; @@ -425,8 +425,8 @@ Gregory > + 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */ > + 0x82000000 0x2 0 MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 0.1 MEM */>; > + -> -+ pcie@1,0 { -> ++ pcie1: pcie@1,0 { +> -+ pcie at 1,0 { +> ++ pcie1: pcie at 1,0 { > + device_type = "pci"; > + assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; > + reg = <0x0800 0 0 0 0>; @@ -435,7 +435,7 @@ Gregory > + }; > + > -+ dfx-registers { -> ++ dfxr: dfx-registers@ac000000 { +> ++ dfxr: dfx-registers at ac000000 { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; @@ -444,7 +444,7 @@ Gregory > + }; > + > -+ switch { -> ++ switch: switch@a8000000 { +> ++ switch: switch at a8000000 { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; @@ -637,10 +637,10 @@ Gregory > ++}; > + > -+ internal-regs { -> -+ serial@12000 { +> -+ serial at 12000 { > -+ status = "okay"; > -+ }; -> -+ serial@12100 { +> -+ serial at 12100 { > -+ status = "okay"; > -+ }; > ++&i2c0 { @@ -648,7 +648,7 @@ Gregory > ++ status = "okay"; > ++}; > + -> -+ i2c@11000 { +> -+ i2c at 11000 { > -+ clock-frequency = <100000>; > -+ status = "okay"; > -+ }; @@ -656,7 +656,7 @@ Gregory > ++ status = "okay"; > ++}; > + -> -+ mvsdio@d4000 { +> -+ mvsdio at d4000 { > -+ pinctrl-0 = <&sdio_pins>; > -+ pinctrl-names = "default"; > -+ status = "okay"; @@ -667,7 +667,7 @@ Gregory > ++ status = "okay"; > ++}; > + -> -+ nand@d0000 { +> -+ nand at d0000 { > -+ status = "okay"; > -+ num-cs = <1>; > -+ marvell,nand-keep-config; @@ -794,17 +794,17 @@ Gregory > ++}; > + > -+ internal-regs { -> -+ serial@12000 { +> -+ serial at 12000 { > -+ status = "okay"; > -+ }; -> -+ serial@12100 { +> -+ serial at 12100 { > -+ status = "okay"; > -+ }; > ++&uart0 { > ++ status = "okay"; > ++}; > + -> -+ i2c@11000 { +> -+ i2c at 11000 { > -+ clock-frequency = <100000>; > -+ status = "okay"; > -+ }; @@ -812,7 +812,7 @@ Gregory > ++ status = "okay"; > ++}; > + -> -+ mvsdio@d4000 { +> -+ mvsdio at d4000 { > -+ status = "disabled"; > -+ }; > ++&i2c0 { @@ -820,7 +820,7 @@ Gregory > ++ status = "okay"; > ++}; > + -> -+ nand@d0000 { +> -+ nand at d0000 { > -+ status = "okay"; > -+ num-cs = <1>; > -+ marvell,nand-keep-config; diff --git a/a/content_digest b/N2/content_digest index 3c1defc..096f6fc 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,32 +1,8 @@ "ref\020170127032546.14657-1-chris.packham@alliedtelesis.co.nz\0" - "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" - "Subject\0Re: [PATCHv5 0/5] Support for Marvell switches with integrated CPUs\0" + "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" + "Subject\0[PATCHv5 0/5] Support for Marvell switches with integrated CPUs\0" "Date\0Fri, 27 Jan 2017 17:39:45 +0100\0" - "To\0Stephen Boyd <sboyd@codeaurora.org>" - Linus Walleij <linus.walleij@linaro.org> - " Chris Packham <chris.packham@alliedtelesis.co.nz>\0" - "Cc\0linux@armlinux.org.uk" - linux-arm-kernel@lists.infradead.org - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Michael Turquette <mturquette@baylibre.com> - Jason Cooper <jason@lakedaemon.net> - Andrew Lunn <andrew@lunn.ch> - Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - Geert Uytterhoeven <geert+renesas@glider.be> - Chris Brand <chris.brand@broadcom.com> - Florian Fainelli <f.fainelli@gmail.com> - Arnd Bergmann <arnd@arndb.de> - Thierry Reding <treding@nvidia.com> - Sudeep Holla <sudeep.holla@arm.com> - Juri Lelli <juri.lelli@arm.com> - Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - Laxman Dewangan <ldewangan@nvidia.com> - Kalyan Kinthada <kalyan.kinthada@alliedtelesis.co.nz> - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-clk@vger.kernel.org - " linux-gpio@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi all,\n" @@ -448,7 +424,7 @@ "> ++\t\t * 98DX3236 has 1 x1 PCIe unit Gen2.0\n" "> +\t\t */\n" "> -+\t\tpcie-controller {\n" - "> ++\t\tpciec: pcie-controller@82000000 {\n" + "> ++\t\tpciec: pcie-controller at 82000000 {\n" "> +\t\t\tcompatible = \"marvell,armada-xp-pcie\";\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\tdevice_type = \"pci\";\n" @@ -456,8 +432,8 @@ "> +\t\t\t\t0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */\n" "> +\t\t\t\t0x82000000 0x2 0 MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 0.1 MEM */>;\n" "> +\n" - "> -+\t\t\tpcie@1,0 {\n" - "> ++\t\t\tpcie1: pcie@1,0 {\n" + "> -+\t\t\tpcie at 1,0 {\n" + "> ++\t\t\tpcie1: pcie at 1,0 {\n" "> +\t\t\t\tdevice_type = \"pci\";\n" "> +\t\t\t\tassigned-addresses = <0x82000800 0 0x40000 0 0x2000>;\n" "> +\t\t\t\treg = <0x0800 0 0 0 0>;\n" @@ -466,7 +442,7 @@ "> +\t\t};\n" "> +\n" "> -+\t\tdfx-registers {\n" - "> ++\t\tdfxr: dfx-registers@ac000000 {\n" + "> ++\t\tdfxr: dfx-registers at ac000000 {\n" "> +\t\t\tcompatible = \"simple-bus\";\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" @@ -475,7 +451,7 @@ "> +\t\t};\n" "> +\n" "> -+\t\tswitch {\n" - "> ++\t\tswitch: switch@a8000000 {\n" + "> ++\t\tswitch: switch at a8000000 {\n" "> +\t\t\tcompatible = \"simple-bus\";\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" @@ -668,10 +644,10 @@ "> ++};\n" "> +\n" "> -+\t\tinternal-regs {\n" - "> -+\t\t\tserial@12000 {\n" + "> -+\t\t\tserial at 12000 {\n" "> -+\t\t\t\tstatus = \"okay\";\n" "> -+\t\t\t};\n" - "> -+\t\t\tserial@12100 {\n" + "> -+\t\t\tserial at 12100 {\n" "> -+\t\t\t\tstatus = \"okay\";\n" "> -+\t\t\t};\n" "> ++&i2c0 {\n" @@ -679,7 +655,7 @@ "> ++\tstatus = \"okay\";\n" "> ++};\n" "> +\n" - "> -+\t\t\ti2c@11000 {\n" + "> -+\t\t\ti2c at 11000 {\n" "> -+\t\t\t\tclock-frequency = <100000>;\n" "> -+\t\t\t\tstatus = \"okay\";\n" "> -+\t\t\t};\n" @@ -687,7 +663,7 @@ "> ++\tstatus = \"okay\";\n" "> ++};\n" "> +\n" - "> -+\t\t\tmvsdio@d4000 {\n" + "> -+\t\t\tmvsdio at d4000 {\n" "> -+\t\t\t\tpinctrl-0 = <&sdio_pins>;\n" "> -+\t\t\t\tpinctrl-names = \"default\";\n" "> -+\t\t\t\tstatus = \"okay\";\n" @@ -698,7 +674,7 @@ "> ++\tstatus = \"okay\";\n" "> ++};\n" "> +\n" - "> -+\t\t\tnand@d0000 {\n" + "> -+\t\t\tnand at d0000 {\n" "> -+\t\t\t\tstatus = \"okay\";\n" "> -+\t\t\t\tnum-cs = <1>;\n" "> -+\t\t\t\tmarvell,nand-keep-config;\n" @@ -825,17 +801,17 @@ "> ++};\n" "> +\n" "> -+\t\tinternal-regs {\n" - "> -+\t\t\tserial@12000 {\n" + "> -+\t\t\tserial at 12000 {\n" "> -+\t\t\t\tstatus = \"okay\";\n" "> -+\t\t\t};\n" - "> -+\t\t\tserial@12100 {\n" + "> -+\t\t\tserial at 12100 {\n" "> -+\t\t\t\tstatus = \"okay\";\n" "> -+\t\t\t};\n" "> ++&uart0 {\n" "> ++\tstatus = \"okay\";\n" "> ++};\n" "> +\n" - "> -+\t\t\ti2c@11000 {\n" + "> -+\t\t\ti2c at 11000 {\n" "> -+\t\t\t\tclock-frequency = <100000>;\n" "> -+\t\t\t\tstatus = \"okay\";\n" "> -+\t\t\t};\n" @@ -843,7 +819,7 @@ "> ++\tstatus = \"okay\";\n" "> ++};\n" "> +\n" - "> -+\t\t\tmvsdio@d4000 {\n" + "> -+\t\t\tmvsdio at d4000 {\n" "> -+\t\t\t\tstatus = \"disabled\";\n" "> -+\t\t\t};\n" "> ++&i2c0 {\n" @@ -851,7 +827,7 @@ "> ++\tstatus = \"okay\";\n" "> ++};\n" "> +\n" - "> -+\t\t\tnand@d0000 {\n" + "> -+\t\t\tnand at d0000 {\n" "> -+\t\t\t\tstatus = \"okay\";\n" "> -+\t\t\t\tnum-cs = <1>;\n" "> -+\t\t\t\tmarvell,nand-keep-config;\n" @@ -884,4 +860,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -70a0ae38e80d91ca11f1acbade7337175452d7a753b31f59e64f2fe8a9b845b0 +a5a45d9e2d18d1ddf1d1b40d2e27fbff0fad80b489add85630c58912f750d5c9
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.