diff for duplicates of <20170113151747.6bc85245@bbrezillon> diff --git a/a/content_digest b/N1/content_digest index 7756588..afd5806 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -13,11 +13,11 @@ Mark Rutland <mark.rutland@arm.com> Matthias Brugger <matthias.bgg@gmail.com> Russell King <linux@armlinux.org.uk> - linux-mtd@lists.infradead.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-mediatek@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + <linux-mtd@lists.infradead.org> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <linux-mediatek@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On Fri, 13 Jan 2017 15:13:29 +0800\n" @@ -95,4 +95,4 @@ "> \t\tcompatible = \"mediatek,mt2701-mmsys\", \"syscon\";\n" "> \t\treg = <0 0x14000000 0 0x1000>;" -4c5e3dc0a2e5076e76845c479d18985cb9e74ca6c8f757afb0679ce1b66bf513 +ea7ca809c5b7d9a2f9f772ce78c151855540174677b3f6ccbae7f48c08bae03d
diff --git a/a/1.txt b/N2/1.txt index c853c35..09c0086 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -21,7 +21,7 @@ Guochun Mao <guochun.mao@mediatek.com> wrote: > + pinctrl-names = "default"; > + pinctrl-0 = <&nor_pins_default>; > + status = "okay"; -> + flash@0 { +> + flash at 0 { > + compatible = "jedec,spi-nor"; > + reg = <0>; > + }; @@ -53,7 +53,7 @@ Guochun Mao <guochun.mao@mediatek.com> wrote: > status = "disabled"; > }; > -> + nor_flash: spi@11014000 { +> + nor_flash: spi at 11014000 { > + compatible = "mediatek,mt2701-nor", > + "mediatek,mt8173-nor"; @@ -69,6 +69,6 @@ subset of the features supported by "mediatek,mt2701-nor"? > + status = "disabled"; > + }; > + -> mmsys: syscon@14000000 { +> mmsys: syscon at 14000000 { > compatible = "mediatek,mt2701-mmsys", "syscon"; > reg = <0 0x14000000 0 0x1000>; diff --git a/a/content_digest b/N2/content_digest index 7756588..622c4e5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,23 +1,9 @@ "ref\01484291609-20195-1-git-send-email-guochun.mao@mediatek.com\0" "ref\01484291609-20195-3-git-send-email-guochun.mao@mediatek.com\0" - "From\0Boris Brezillon <boris.brezillon@free-electrons.com>\0" - "Subject\0Re: [PATCH v1 2/2] arm: dts: mt2701: add nor flash node\0" + "From\0boris.brezillon@free-electrons.com (Boris Brezillon)\0" + "Subject\0[PATCH v1 2/2] arm: dts: mt2701: add nor flash node\0" "Date\0Fri, 13 Jan 2017 15:17:47 +0100\0" - "To\0Guochun Mao <guochun.mao@mediatek.com>\0" - "Cc\0David Woodhouse <dwmw2@infradead.org>" - Brian Norris <computersforpeace@gmail.com> - Marek Vasut <marek.vasut@gmail.com> - Richard Weinberger <richard@nod.at> - Cyrille Pitchen <cyrille.pitchen@atmel.com> - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Matthias Brugger <matthias.bgg@gmail.com> - Russell King <linux@armlinux.org.uk> - linux-mtd@lists.infradead.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-mediatek@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, 13 Jan 2017 15:13:29 +0800\n" @@ -43,7 +29,7 @@ "> +\tpinctrl-names = \"default\";\n" "> +\tpinctrl-0 = <&nor_pins_default>;\n" "> +\tstatus = \"okay\";\n" - "> +\tflash@0 {\n" + "> +\tflash at 0 {\n" "> +\t\tcompatible = \"jedec,spi-nor\";\n" "> +\t\treg = <0>;\n" "> +\t};\n" @@ -75,7 +61,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tnor_flash: spi@11014000 {\n" + "> +\tnor_flash: spi at 11014000 {\n" "> +\t\tcompatible = \"mediatek,mt2701-nor\",\n" "> +\t\t\t \"mediatek,mt8173-nor\";\n" "\n" @@ -91,8 +77,8 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> \tmmsys: syscon@14000000 {\n" + "> \tmmsys: syscon at 14000000 {\n" "> \t\tcompatible = \"mediatek,mt2701-mmsys\", \"syscon\";\n" "> \t\treg = <0 0x14000000 0 0x1000>;" -4c5e3dc0a2e5076e76845c479d18985cb9e74ca6c8f757afb0679ce1b66bf513 +b824bde2f230f6d3764ff5f21b91f3cfb0c929ca46b1b7fa7faea58a321de80e
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.