diff for duplicates of <52555634.7020500@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 2f3799c..ce5c5cd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,18 +15,18 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- a/arch/arm/boot/dts/sama5d3xcm.dtsi > +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi > @@ -38,6 +38,12 @@ -> macb0: ethernet at f0028000 { +> macb0: ethernet@f0028000 { > phy-mode = "rgmii"; > }; > + -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + main: mainck { > + clock-frequency = <12000000>; > + }; > + }; > }; > -> nand0: nand at 60000000 { +> nand0: nand@60000000 { > diff --git a/a/content_digest b/N1/content_digest index 7809823..368346c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\01375951572-10829-1-git-send-email-b.brezillon@overkiz.com\0" "ref\01375954563-11343-1-git-send-email-b.brezillon@overkiz.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH 4/6] ARM: at91/dt: define sama5d3xek's main clk frequency\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH 4/6] ARM: at91/dt: define sama5d3xek's main clk frequency\0" "Date\0Wed, 9 Oct 2013 15:12:20 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris BREZILLON <b.brezillon@overkiz.com>" + Russell King <linux@arm.linux.org.uk> + Andrew Victor <linux@maxim.org.za> + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + Ludovic Desroches <ludovic.desroches@atmel.com> + " Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + linux-kernel@vger.kernel.org + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "On 08/08/2013 11:36, Boris BREZILLON :\n" @@ -23,22 +31,22 @@ "> --- a/arch/arm/boot/dts/sama5d3xcm.dtsi\n" "> +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi\n" "> @@ -38,6 +38,12 @@\n" - "> \t\t\tmacb0: ethernet at f0028000 {\n" + "> \t\t\tmacb0: ethernet@f0028000 {\n" "> \t\t\t\tphy-mode = \"rgmii\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tmain: mainck {\n" "> +\t\t\t\t\tclock-frequency = <12000000>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> \t\t};\n" ">\n" - "> \t\tnand0: nand at 60000000 {\n" + "> \t\tnand0: nand@60000000 {\n" ">\n" "\n" "\n" "-- \n" Nicolas Ferre -668ef34428a37a9bfd36e71984e9ee43a928ee1a7eb800115d378965cef5f9c8 +8af4f9c920ef2dcb5c9a96b52d9679893702482fa1c4fffb167289524d2fb10e
diff --git a/a/1.txt b/N2/1.txt index 2f3799c..ce5c5cd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,18 +15,18 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- a/arch/arm/boot/dts/sama5d3xcm.dtsi > +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi > @@ -38,6 +38,12 @@ -> macb0: ethernet at f0028000 { +> macb0: ethernet@f0028000 { > phy-mode = "rgmii"; > }; > + -> + pmc: pmc at fffffc00 { +> + pmc: pmc@fffffc00 { > + main: mainck { > + clock-frequency = <12000000>; > + }; > + }; > }; > -> nand0: nand at 60000000 { +> nand0: nand@60000000 { > diff --git a/a/content_digest b/N2/content_digest index 7809823..b315654 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,17 @@ "ref\01375951572-10829-1-git-send-email-b.brezillon@overkiz.com\0" "ref\01375954563-11343-1-git-send-email-b.brezillon@overkiz.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH 4/6] ARM: at91/dt: define sama5d3xek's main clk frequency\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH 4/6] ARM: at91/dt: define sama5d3xek's main clk frequency\0" "Date\0Wed, 9 Oct 2013 15:12:20 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris BREZILLON <b.brezillon@overkiz.com>" + Russell King <linux@arm.linux.org.uk> + Andrew Victor <linux@maxim.org.za> + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + Ludovic Desroches <ludovic.desroches@atmel.com> + " Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>\0" + "Cc\0<linux-arm-kernel@lists.infradead.org>" + <linux-kernel@vger.kernel.org> + " <devicetree@vger.kernel.org>\0" "\00:1\0" "b\0" "On 08/08/2013 11:36, Boris BREZILLON :\n" @@ -23,22 +31,22 @@ "> --- a/arch/arm/boot/dts/sama5d3xcm.dtsi\n" "> +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi\n" "> @@ -38,6 +38,12 @@\n" - "> \t\t\tmacb0: ethernet at f0028000 {\n" + "> \t\t\tmacb0: ethernet@f0028000 {\n" "> \t\t\t\tphy-mode = \"rgmii\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tpmc: pmc at fffffc00 {\n" + "> +\t\t\tpmc: pmc@fffffc00 {\n" "> +\t\t\t\tmain: mainck {\n" "> +\t\t\t\t\tclock-frequency = <12000000>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> \t\t};\n" ">\n" - "> \t\tnand0: nand at 60000000 {\n" + "> \t\tnand0: nand@60000000 {\n" ">\n" "\n" "\n" "-- \n" Nicolas Ferre -668ef34428a37a9bfd36e71984e9ee43a928ee1a7eb800115d378965cef5f9c8 +76f0c09625c6195ec4812699dce69adc60fa22ba81fe80958921525965b9f925
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.