diff for duplicates of <1526055052-11371-1-git-send-email-thor.thayer@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index afb1517..9a541fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,13 +32,13 @@ index e6b059378dc0..bac01b0b7907 100644 + }; }; - gmac0: ethernet at ff800000 { + gmac0: ethernet@ff800000 { @@ -466,5 +472,21 @@ interrupts = <16 4>, <48 4>; }; }; + -+ qspi: spi at ff8d2000 { ++ qspi: spi@ff8d2000 { + compatible = "cdns,qspi-nor"; + #address-cells = <1>; + #size-cells = <0>; @@ -65,7 +65,7 @@ index f9b1ef12db48..96542150654b 100644 }; + +&qspi { -+ flash at 0 { ++ flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "n25q00aa"; @@ -86,12 +86,12 @@ index f9b1ef12db48..96542150654b 100644 + #address-cells = <1>; + #size-cells = <1>; + -+ qspi_boot: partition at 0 { ++ qspi_boot: partition@0 { + label = "Boot and fpga data"; + reg = <0x0 0x4000000>; + }; + -+ qspi_rootfs: partition at 4000000 { ++ qspi_rootfs: partition@4000000 { + label = "Root Filesystem - JFFS2"; + reg = <0x4000000 0x4000000>; + }; diff --git a/a/content_digest b/N1/content_digest index 83a2611..2b639fa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,15 @@ - "From\0thor.thayer@linux.intel.com (thor.thayer at linux.intel.com)\0" + "From\0thor.thayer@linux.intel.com\0" "Subject\0[PATCHv2] arm64: dts: stratix10: Add QSPI support for Stratix10\0" "Date\0Fri, 11 May 2018 11:10:52 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0dinguyen@kernel.org" + robh+dt@kernel.org + " mark.rutland@arm.com\0" + "Cc\0catalin.marinas@arm.com" + will.deacon@arm.com + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + " Thor Thayer <thor.thayer@linux.intel.com>\0" "\00:1\0" "b\0" "From: Thor Thayer <thor.thayer@linux.intel.com>\n" @@ -38,13 +46,13 @@ "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\tgmac0: ethernet at ff800000 {\n" + " \t\tgmac0: ethernet@ff800000 {\n" "@@ -466,5 +472,21 @@\n" " \t\t\t\tinterrupts = <16 4>, <48 4>;\n" " \t\t\t};\n" " \t\t};\n" "+\n" - "+\t\tqspi: spi at ff8d2000 {\n" + "+\t\tqspi: spi@ff8d2000 {\n" "+\t\t\tcompatible = \"cdns,qspi-nor\";\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" @@ -71,7 +79,7 @@ " };\n" "+\n" "+&qspi {\n" - "+\tflash at 0 {\n" + "+\tflash@0 {\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" "+\t\tcompatible = \"n25q00aa\";\n" @@ -92,12 +100,12 @@ "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <1>;\n" "+\n" - "+\t\t\tqspi_boot: partition at 0 {\n" + "+\t\t\tqspi_boot: partition@0 {\n" "+\t\t\t\tlabel = \"Boot and fpga data\";\n" "+\t\t\t\treg = <0x0 0x4000000>;\n" "+\t\t\t};\n" "+\n" - "+\t\t\tqspi_rootfs: partition at 4000000 {\n" + "+\t\t\tqspi_rootfs: partition@4000000 {\n" "+\t\t\t\tlabel = \"Root Filesystem - JFFS2\";\n" "+\t\t\t\treg = <0x4000000 0x4000000>;\n" "+\t\t\t};\n" @@ -107,4 +115,4 @@ "-- \n" 2.7.4 -28e71d2c3e72843c1d51525a5f9d074fb2e5a59c1e4092e31499961a2410c8d7 +8447f294cd465e6b32995c9d148ee0672c17008d1ba7fbd70ffdd245f36cabe7
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.