diff for duplicates of <555AFD44.7040007@atmel.com> diff --git a/a/1.txt b/N1/1.txt index c872e64..30c5882 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -Le 27/04/2015 15:19, Ludovic Desroches a ?crit : +Le 27/04/2015 15:19, Ludovic Desroches a écrit : > From: Ben Dooks <ben.dooks@codethink.co.uk> > > The mmc1 channel is not populated on the SAM5D3 Xplained board, however @@ -36,18 +36,18 @@ Bye, > }; > }; > -> + mmc1: mmc at f8000000 { +> + mmc1: mmc@f8000000 { > + vmmc-supply = <&vcc_3v3_reg>; > + vqmmc-supply = <&vcc_3v3_reg>; > + status = "disabled"; -> + slot at 0 { +> + slot@0 { > + reg = <0>; > + bus-width = <4>; > + cd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>; > + }; > + }; > + -> spi0: spi at f0004000 { +> spi0: spi@f0004000 { > cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>; > status = "okay"; > diff --git a/a/content_digest b/N1/content_digest index 37dd616..545003f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,18 @@ "ref\01430140753-19998-1-git-send-email-ludovic.desroches@atmel.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH 1/4] ARM: at91/dt: sama5d3 xplained: fill in mmc1 and set it to disabled\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH 1/4] ARM: at91/dt: sama5d3 xplained: fill in mmc1 and set it to disabled\0" "Date\0Tue, 19 May 2015 11:07:16 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Ludovic Desroches <ludovic.desroches@atmel.com>" + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " ben.dooks@codethink.co.uk\0" + "Cc\0linux-kernel@vger.kernel.org" + plagnioj@jcrosoft.com + Alexandre Belloni <alexandre.belloni@free-electrons.com> + " Boris BREZILLON <boris.brezillon@free-electrons.com>\0" "\00:1\0" "b\0" - "Le 27/04/2015 15:19, Ludovic Desroches a ?crit :\n" + "Le 27/04/2015 15:19, Ludovic Desroches a \303\251crit :\n" "> From: Ben Dooks <ben.dooks@codethink.co.uk>\n" "> \n" "> The mmc1 channel is not populated on the SAM5D3 Xplained board, however\n" @@ -43,18 +50,18 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tmmc1: mmc at f8000000 {\n" + "> +\t\t\tmmc1: mmc@f8000000 {\n" "> +\t\t\t\tvmmc-supply = <&vcc_3v3_reg>;\n" "> +\t\t\t\tvqmmc-supply = <&vcc_3v3_reg>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" - "> +\t\t\t\tslot at 0 {\n" + "> +\t\t\t\tslot@0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tbus-width = <4>;\n" "> +\t\t\t\t\tcd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tspi0: spi at f0004000 {\n" + "> \t\t\tspi0: spi@f0004000 {\n" "> \t\t\t\tcs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;\n" "> \t\t\t\tstatus = \"okay\";\n" "> \n" @@ -63,4 +70,4 @@ "-- \n" Nicolas Ferre -6693d09138e788e0bf7df33002532049beb463299da2cd181b59eb688850af5c +598dd276846206c73d1cc6dd9b45c4c7654556908b4f4cabb37b9ce45b82853e
diff --git a/a/1.txt b/N2/1.txt index c872e64..30c5882 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -Le 27/04/2015 15:19, Ludovic Desroches a ?crit : +Le 27/04/2015 15:19, Ludovic Desroches a écrit : > From: Ben Dooks <ben.dooks@codethink.co.uk> > > The mmc1 channel is not populated on the SAM5D3 Xplained board, however @@ -36,18 +36,18 @@ Bye, > }; > }; > -> + mmc1: mmc at f8000000 { +> + mmc1: mmc@f8000000 { > + vmmc-supply = <&vcc_3v3_reg>; > + vqmmc-supply = <&vcc_3v3_reg>; > + status = "disabled"; -> + slot at 0 { +> + slot@0 { > + reg = <0>; > + bus-width = <4>; > + cd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>; > + }; > + }; > + -> spi0: spi at f0004000 { +> spi0: spi@f0004000 { > cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>; > status = "okay"; > diff --git a/a/content_digest b/N2/content_digest index 37dd616..d7e8eb2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,11 +1,18 @@ "ref\01430140753-19998-1-git-send-email-ludovic.desroches@atmel.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH 1/4] ARM: at91/dt: sama5d3 xplained: fill in mmc1 and set it to disabled\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH 1/4] ARM: at91/dt: sama5d3 xplained: fill in mmc1 and set it to disabled\0" "Date\0Tue, 19 May 2015 11:07:16 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Ludovic Desroches <ludovic.desroches@atmel.com>" + <linux-arm-kernel@lists.infradead.org> + <devicetree@vger.kernel.org> + " <ben.dooks@codethink.co.uk>\0" + "Cc\0<linux-kernel@vger.kernel.org>" + <plagnioj@jcrosoft.com> + Alexandre Belloni <alexandre.belloni@free-electrons.com> + " Boris BREZILLON <boris.brezillon@free-electrons.com>\0" "\00:1\0" "b\0" - "Le 27/04/2015 15:19, Ludovic Desroches a ?crit :\n" + "Le 27/04/2015 15:19, Ludovic Desroches a \303\251crit :\n" "> From: Ben Dooks <ben.dooks@codethink.co.uk>\n" "> \n" "> The mmc1 channel is not populated on the SAM5D3 Xplained board, however\n" @@ -43,18 +50,18 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tmmc1: mmc at f8000000 {\n" + "> +\t\t\tmmc1: mmc@f8000000 {\n" "> +\t\t\t\tvmmc-supply = <&vcc_3v3_reg>;\n" "> +\t\t\t\tvqmmc-supply = <&vcc_3v3_reg>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" - "> +\t\t\t\tslot at 0 {\n" + "> +\t\t\t\tslot@0 {\n" "> +\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\tbus-width = <4>;\n" "> +\t\t\t\t\tcd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tspi0: spi at f0004000 {\n" + "> \t\t\tspi0: spi@f0004000 {\n" "> \t\t\t\tcs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;\n" "> \t\t\t\tstatus = \"okay\";\n" "> \n" @@ -63,4 +70,4 @@ "-- \n" Nicolas Ferre -6693d09138e788e0bf7df33002532049beb463299da2cd181b59eb688850af5c +3f8ed76f8606a64285fd3fb926c6774270e4faa27bdaf6c953a971f08ca53ff9
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.