diff for duplicates of <87a8524u0x.fsf@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index d655ce1..98d21e4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ Gregory > --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi > @@ -62,7 +62,7 @@ -> cpm_ethernet: ethernet@0 { +> cpm_ethernet: ethernet at 0 { > compatible = "marvell,armada-7k-pp22"; > reg = <0x0 0x100000>, <0x129000 0xb000>; > - clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>; @@ -35,7 +35,7 @@ Gregory > @@ -97,10 +97,13 @@ > }; > -> cpm_syscon0: system-controller@440000 { +> cpm_syscon0: system-controller at 440000 { > - compatible = "marvell,cp110-system-controller0", > - "syscon"; > + compatible = "syscon", "simple-mfd"; @@ -48,7 +48,7 @@ Gregory > + }; > }; > -> cpm_rtc: rtc@284000 { +> cpm_rtc: rtc at 284000 { > @@ -115,7 +118,7 @@ > "generic-ahci"; > reg = <0x540000 0x30000>; @@ -84,7 +84,7 @@ Gregory > + clocks = <&cpm_clk 1 8>; > }; > -> cpm_xor1: xor@6c0000 { +> cpm_xor1: xor at 6c0000 { > @@ -154,7 +157,7 @@ > <0x6d0000 0x1000>; > dma-coherent; @@ -93,7 +93,7 @@ Gregory > + clocks = <&cpm_clk 1 7>; > }; > -> cpm_spi0: spi@700600 { +> cpm_spi0: spi at 700600 { > @@ -163,7 +166,7 @@ > #address-cells = <0x1>; > #size-cells = <0x0>; @@ -191,7 +191,7 @@ Gregory > @@ -104,10 +104,13 @@ > }; > -> cps_syscon0: system-controller@440000 { +> cps_syscon0: system-controller at 440000 { > - compatible = "marvell,cp110-system-controller0", > - "syscon"; > + compatible = "syscon", "simple-mfd"; @@ -204,7 +204,7 @@ Gregory > + }; > }; > -> cps_sata0: sata@540000 { +> cps_sata0: sata at 540000 { > @@ -115,7 +118,7 @@ > "generic-ahci"; > reg = <0x540000 0x30000>; @@ -240,7 +240,7 @@ Gregory > + clocks = <&cps_clk 1 8>; > }; > -> cps_xor1: xor@6c0000 { +> cps_xor1: xor at 6c0000 { > @@ -154,7 +157,7 @@ > <0x6d0000 0x1000>; > dma-coherent; @@ -249,7 +249,7 @@ Gregory > + clocks = <&cps_clk 1 7>; > }; > -> cps_spi0: spi@700600 { +> cps_spi0: spi at 700600 { > @@ -163,7 +166,7 @@ > #address-cells = <0x1>; > #size-cells = <0x0>; diff --git a/a/content_digest b/N1/content_digest index c1155f7..73a6743 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,9 @@ "ref\0cover.6bb422e6a233460049bb63792b32a5ba851dcddd.1496328934.git-series.gregory.clement@free-electrons.com\0" "ref\09c5807cafb03413f4318f6c95a2e093bd9cdcdcf.1496328934.git-series.gregory.clement@free-electrons.com\0" - "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" - "Subject\0Re: [PATCH v3 9/9] arm64: dts: marvell: use new binding for the system controller on cp110\0" + "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" + "Subject\0[PATCH v3 9/9] arm64: dts: marvell: use new binding for the system controller on cp110\0" "Date\0Tue, 20 Jun 2017 16:23:58 +0200\0" - "To\0Stephen Boyd <sboyd@codeaurora.org>\0" - "Cc\0Mike Turquette <mturquette@baylibre.com>" - linux-clk@vger.kernel.org - linux-kernel@vger.kernel.org - Jason Cooper <jason@lakedaemon.net> - Andrew Lunn <andrew@lunn.ch> - Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - linux-arm-kernel@lists.infradead.org - Rob Herring <robh+dt@kernel.org> - devicetree@vger.kernel.org - Nadav Haklai <nadavh@marvell.com> - Kostya Porotchkin <kostap@marvell.com> - Neta Zur Hershkovits <neta@marvell.com> - Marcin Wojtas <mw@semihalf.com> - Omri Itach <omrii@marvell.com> - " Shadi Ammouri <shadi@marvell.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -48,7 +32,7 @@ "> --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi\n" "> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi\n" "> @@ -62,7 +62,7 @@\n" - "> \t\t\tcpm_ethernet: ethernet@0 {\n" + "> \t\t\tcpm_ethernet: ethernet at 0 {\n" "> \t\t\t\tcompatible = \"marvell,armada-7k-pp22\";\n" "> \t\t\t\treg = <0x0 0x100000>, <0x129000 0xb000>;\n" "> -\t\t\t\tclocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>;\n" @@ -59,7 +43,7 @@ "> @@ -97,10 +97,13 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcpm_syscon0: system-controller@440000 {\n" + "> \t\t\tcpm_syscon0: system-controller at 440000 {\n" "> -\t\t\t\tcompatible = \"marvell,cp110-system-controller0\",\n" "> -\t\t\t\t\t \"syscon\";\n" "> +\t\t\t\tcompatible = \"syscon\", \"simple-mfd\";\n" @@ -72,7 +56,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcpm_rtc: rtc@284000 {\n" + "> \t\t\tcpm_rtc: rtc at 284000 {\n" "> @@ -115,7 +118,7 @@\n" "> \t\t\t\t\t \"generic-ahci\";\n" "> \t\t\t\treg = <0x540000 0x30000>;\n" @@ -108,7 +92,7 @@ "> +\t\t\t\tclocks = <&cpm_clk 1 8>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcpm_xor1: xor@6c0000 {\n" + "> \t\t\tcpm_xor1: xor at 6c0000 {\n" "> @@ -154,7 +157,7 @@\n" "> \t\t\t\t <0x6d0000 0x1000>;\n" "> \t\t\t\tdma-coherent;\n" @@ -117,7 +101,7 @@ "> +\t\t\t\tclocks = <&cpm_clk 1 7>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcpm_spi0: spi@700600 {\n" + "> \t\t\tcpm_spi0: spi at 700600 {\n" "> @@ -163,7 +166,7 @@\n" "> \t\t\t\t#address-cells = <0x1>;\n" "> \t\t\t\t#size-cells = <0x0>;\n" @@ -215,7 +199,7 @@ "> @@ -104,10 +104,13 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcps_syscon0: system-controller@440000 {\n" + "> \t\t\tcps_syscon0: system-controller at 440000 {\n" "> -\t\t\t\tcompatible = \"marvell,cp110-system-controller0\",\n" "> -\t\t\t\t\t \"syscon\";\n" "> +\t\t\t\tcompatible = \"syscon\", \"simple-mfd\";\n" @@ -228,7 +212,7 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcps_sata0: sata@540000 {\n" + "> \t\t\tcps_sata0: sata at 540000 {\n" "> @@ -115,7 +118,7 @@\n" "> \t\t\t\t\t \"generic-ahci\";\n" "> \t\t\t\treg = <0x540000 0x30000>;\n" @@ -264,7 +248,7 @@ "> +\t\t\t\tclocks = <&cps_clk 1 8>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcps_xor1: xor@6c0000 {\n" + "> \t\t\tcps_xor1: xor at 6c0000 {\n" "> @@ -154,7 +157,7 @@\n" "> \t\t\t\t <0x6d0000 0x1000>;\n" "> \t\t\t\tdma-coherent;\n" @@ -273,7 +257,7 @@ "> +\t\t\t\tclocks = <&cps_clk 1 7>;\n" "> \t\t\t};\n" "> \n" - "> \t\t\tcps_spi0: spi@700600 {\n" + "> \t\t\tcps_spi0: spi at 700600 {\n" "> @@ -163,7 +166,7 @@\n" "> \t\t\t\t#address-cells = <0x1>;\n" "> \t\t\t\t#size-cells = <0x0>;\n" @@ -355,4 +339,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -e490871106f8ddb851f3925634577213b46600d56812eb16c7ee893e6d9af0ed +e392f101cb678dedc1616881aab30ccd49bee3678c104fd82654480bd55dd865
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.