diff for duplicates of <7036752.0LCvRcbC9K@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 6d95ea3..f7fac2d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,8 @@ Changes in version 2: 1 file changed, 40 insertions(+) Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts -=================================--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts +++ renesas/arch/arm/boot/dts/r8a7794-silk.dts @@ -65,6 +65,11 @@ renesas,groups = "mmc_data8", "mmc_ctrl"; @@ -40,7 +41,7 @@ Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts + + status = "okay"; + -+ flash@0 { ++ flash at 0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spansion,s25fl512s", "jedec,spi-nor"; @@ -52,17 +53,17 @@ Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts + spi-cpha; + m25p,fast-read; + -+ partition@0 { ++ partition at 0 { + label = "loader"; + reg = <0x00000000 0x00040000>; + read-only; + }; -+ partition@40000 { ++ partition at 40000 { + label = "user"; + reg = <0x00040000 0x00400000>; + read-only; + }; -+ partition@440000 { ++ partition at 440000 { + label = "flash"; + reg = <0x00440000 0x03bc0000>; + }; diff --git a/a/content_digest b/N1/content_digest index 78610a6..1a1533d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\04187771.Fb49GBKgyg@wasted.cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH v2 2/2] ARM: shmobile: silk: add QSPI DT support\0" - "Date\0Mon, 10 Aug 2015 22:00:35 +0000\0" + "Date\0Tue, 11 Aug 2015 01:00:35 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -22,7 +22,8 @@ " 1 file changed, 40 insertions(+)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts\n" "+++ renesas/arch/arm/boot/dts/r8a7794-silk.dts\n" "@@ -65,6 +65,11 @@\n" " \t\trenesas,groups = \"mmc_data8\", \"mmc_ctrl\";\n" @@ -47,7 +48,7 @@ "+\n" "+\tstatus = \"okay\";\n" "+\n" - "+\tflash@0 {\n" + "+\tflash at 0 {\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" "+\t\tcompatible = \"spansion,s25fl512s\", \"jedec,spi-nor\";\n" @@ -59,21 +60,21 @@ "+\t\tspi-cpha;\n" "+\t\tm25p,fast-read;\n" "+\n" - "+\t\tpartition@0 {\n" + "+\t\tpartition at 0 {\n" "+\t\t\tlabel = \"loader\";\n" "+\t\t\treg = <0x00000000 0x00040000>;\n" "+\t\t\tread-only;\n" "+\t\t};\n" - "+\t\tpartition@40000 {\n" + "+\t\tpartition at 40000 {\n" "+\t\t\tlabel = \"user\";\n" "+\t\t\treg = <0x00040000 0x00400000>;\n" "+\t\t\tread-only;\n" "+\t\t};\n" - "+\t\tpartition@440000 {\n" + "+\t\tpartition at 440000 {\n" "+\t\t\tlabel = \"flash\";\n" "+\t\t\treg = <0x00440000 0x03bc0000>;\n" "+\t\t};\n" "+\t};\n" +}; -49300e67bfd0a31f0ac1926051699b567c976b4991a5ce014594e3b9bf484a8e +cc126be84c5e68d0cadd04fe2c1c04dc7de20de8c7f951f7ae2d77cde319e593
diff --git a/a/1.txt b/N2/1.txt index 6d95ea3..757ea77 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,7 +15,8 @@ Changes in version 2: 1 file changed, 40 insertions(+) Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts -=================================--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts +++ renesas/arch/arm/boot/dts/r8a7794-silk.dts @@ -65,6 +65,11 @@ renesas,groups = "mmc_data8", "mmc_ctrl"; diff --git a/a/content_digest b/N2/content_digest index 78610a6..47837c4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\04187771.Fb49GBKgyg@wasted.cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH v2 2/2] ARM: shmobile: silk: add QSPI DT support\0" - "Date\0Mon, 10 Aug 2015 22:00:35 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 11 Aug 2015 01:00:35 +0300\0" + "To\0horms@verge.net.au" + linux-sh@vger.kernel.org + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + " devicetree@vger.kernel.org\0" + "Cc\0magnus.damm@gmail.com" + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Define the SILK board dependent part of the QSPI device node.\n" @@ -22,7 +32,8 @@ " 1 file changed, 40 insertions(+)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7794-silk.dts\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7794-silk.dts\n" "+++ renesas/arch/arm/boot/dts/r8a7794-silk.dts\n" "@@ -65,6 +65,11 @@\n" " \t\trenesas,groups = \"mmc_data8\", \"mmc_ctrl\";\n" @@ -76,4 +87,4 @@ "+\t};\n" +}; -49300e67bfd0a31f0ac1926051699b567c976b4991a5ce014594e3b9bf484a8e +5640e7eff60558ccf03ec70ea3e044de4c113cd5865ab3f15554b8813602b15e
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.