diff for duplicates of <52CD6EFC.9050303@overkiz.com> diff --git a/a/1.txt b/N1/1.txt index e2e5291..fe86dd7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,13 +22,13 @@ On 08/01/2014 16:28, Boris BREZILLON wrote: Sorry, I messed up with the bootargs. I'll remove it in the next version. -> soc@01c00000 { -> + nfc: nand@01c03000 { +> soc at 01c00000 { +> + nfc: nand at 01c03000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>; > + status = "okay"; > + -> + nand@0 { +> + nand at 0 { > + reg = <0>; > + allwinner,rb = <0>; > + nand-ecc-mode = "soft_bch"; @@ -52,6 +52,6 @@ I'll remove it in the next version. > + }; > + }; > + -> pinctrl@01c20800 { -> led_pins_cubietruck: led_pins@0 { +> pinctrl at 01c20800 { +> led_pins_cubietruck: led_pins at 0 { > allwinner,pins = "PH7", "PH11", "PH20", "PH21"; diff --git a/a/content_digest b/N1/content_digest index 9e57e9a..214b724 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,9 @@ "ref\01389190924-26226-1-git-send-email-b.brezillon@overkiz.com\0" "ref\01389194891-26771-1-git-send-email-b.brezillon@overkiz.com\0" - "From\0boris brezillon <b.brezillon@overkiz.com>\0" - "Subject\0Re: [RFC PATCH 9/9] ARM: sunxi/dt: enable NAND on cubietruck board\0" + "From\0b.brezillon@overkiz.com (boris brezillon)\0" + "Subject\0[RFC PATCH 9/9] ARM: sunxi/dt: enable NAND on cubietruck board\0" "Date\0Wed, 08 Jan 2014 16:30:04 +0100\0" - "To\0Maxime Ripard <maxime.ripard@free-electrons.com>" - Rob Landley <rob@landley.net> - Russell King <linux@arm.linux.org.uk> - David Woodhouse <dwmw2@infradead.org> - " Grant Likely <grant.likely@linaro.org>\0" - "Cc\0devicetree@vger.kernel.org" - linux-doc@vger.kernel.org - dev@linux-sunxi.org - linux-kernel@vger.kernel.org - Boris BREZILLON <b.brezillon@overkiz.com> - linux-mtd@lists.infradead.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 08/01/2014 16:28, Boris BREZILLON wrote:\n" @@ -41,13 +30,13 @@ "Sorry, I messed up with the bootargs.\n" "I'll remove it in the next version.\n" "\n" - "> \tsoc@01c00000 {\n" - "> +\t\tnfc: nand@01c03000 {\n" + "> \tsoc at 01c00000 {\n" + "> +\t\tnfc: nand at 01c03000 {\n" "> +\t\t\tpinctrl-names = \"default\";\n" "> +\t\t\tpinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\tnand@0 {\n" + "> +\t\t\tnand at 0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t\tallwinner,rb = <0>;\n" "> +\t\t\t\tnand-ecc-mode = \"soft_bch\";\n" @@ -71,8 +60,8 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tpinctrl@01c20800 {\n" - "> \t\t\tled_pins_cubietruck: led_pins@0 {\n" + "> \t\tpinctrl at 01c20800 {\n" + "> \t\t\tled_pins_cubietruck: led_pins at 0 {\n" "> \t\t\t\tallwinner,pins = \"PH7\", \"PH11\", \"PH20\", \"PH21\";" -9eb717d6e64830659632ffa869345aa2352dcfe360e45c23b9e79ed5516bbe95 +6b3582170fef1f6bb68e49db92b3861c42248ebd80d9223cfb72db1edaa8258f
diff --git a/a/content_digest b/N2/content_digest index 9e57e9a..84ddadb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -10,11 +10,11 @@ " Grant Likely <grant.likely@linaro.org>\0" "Cc\0devicetree@vger.kernel.org" linux-doc@vger.kernel.org - dev@linux-sunxi.org linux-kernel@vger.kernel.org - Boris BREZILLON <b.brezillon@overkiz.com> + linux-arm-kernel@lists.infradead.org linux-mtd@lists.infradead.org - " linux-arm-kernel@lists.infradead.org\0" + dev@linux-sunxi.org + " Boris BREZILLON <b.brezillon@overkiz.com>\0" "\00:1\0" "b\0" "On 08/01/2014 16:28, Boris BREZILLON wrote:\n" @@ -75,4 +75,4 @@ "> \t\t\tled_pins_cubietruck: led_pins@0 {\n" "> \t\t\t\tallwinner,pins = \"PH7\", \"PH11\", \"PH20\", \"PH21\";" -9eb717d6e64830659632ffa869345aa2352dcfe360e45c23b9e79ed5516bbe95 +7fdf3c7875ea9d8e3878ba3b7b024729477a8e98356cf1e5dbe948b5f754ed93
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.