diff for duplicates of <1496385275-6899-11-git-send-email-anup.patel@broadcom.com>
diff --git a/a/1.txt b/N1/1.txt
index 2105614..ba0bb2a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -28,7 +28,7 @@ index c309cda..5671669 100644
+ cs-gpios = <&gpio_hsls 34 0>;
+ status = "okay";
+
-+ spi-flash@0 {
++ spi-flash at 0 {
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <20000000>;
@@ -43,7 +43,7 @@ index c309cda..5671669 100644
+ cs-gpios = <&gpio_hsls 96 0>;
+ status = "okay";
+
-+ spi-flash@0 {
++ spi-flash at 0 {
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <20000000>;
@@ -59,7 +59,7 @@ index 91ba61e..88a6176 100644
status = "disabled";
};
-+ wdt0: watchdog@000c0000 {
++ wdt0: watchdog at 000c0000 {
+ compatible = "arm,sp805", "arm,primecell";
+ reg = <0x000c0000 0x1000>;
+ interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
@@ -67,14 +67,14 @@ index 91ba61e..88a6176 100644
+ clock-names = "wdogclk", "apb_pclk";
+ };
+
- gpio_hsls: gpio@000d0000 {
+ gpio_hsls: gpio at 000d0000 {
compatible = "brcm,iproc-gpio";
reg = <0x000d0000 0x864>;
@@ -359,11 +367,55 @@
status = "disabled";
};
-+ ssp0: ssp@00180000 {
++ ssp0: ssp at 00180000 {
+ compatible = "arm,pl022", "arm,primecell";
+ reg = <0x00180000 0x1000>;
+ interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
@@ -86,7 +86,7 @@ index 91ba61e..88a6176 100644
+ status = "disabled";
+ };
+
-+ ssp1: ssp@00190000 {
++ ssp1: ssp at 00190000 {
+ compatible = "arm,pl022", "arm,primecell";
+ reg = <0x00190000 0x1000>;
+ interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
@@ -98,12 +98,12 @@ index 91ba61e..88a6176 100644
+ status = "disabled";
+ };
+
- hwrng: hwrng@00220000 {
+ hwrng: hwrng at 00220000 {
compatible = "brcm,iproc-rng200";
reg = <0x00220000 0x28>;
};
-+ dma0: dma@00310000 {
++ dma0: dma at 00310000 {
+ compatible = "arm,pl330", "arm,primecell";
+ reg = <0x00310000 0x1000>;
+ interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>,
@@ -123,7 +123,7 @@ index 91ba61e..88a6176 100644
+ iommus = <&smmu 0x6000 0x0000>;
+ };
+
- nand: nand@00360000 {
+ nand: nand at 00360000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
reg = <0x00360000 0x600>,
--
diff --git a/a/content_digest b/N1/content_digest
index 4dab4bb..d13a642 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001496385275-6899-1-git-send-email-anup.patel\@broadcom.com\0"
]
[
- "From\0Anup Patel <anup.patel\@broadcom.com>\0"
+ "From\0anup.patel\@broadcom.com (Anup Patel)\0"
]
[
"Subject\0[PATCH v6 10/11] arm64: dts: Add PL022, PL330 and SP805 DT nodes for Stingray\0"
@@ -11,28 +11,7 @@
"Date\0Fri, 2 Jun 2017 12:04:34 +0530\0"
]
[
- "To\0Rob Herring <robh+dt\@kernel.org>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Michael Turquette <mturquette\@baylibre.com>",
- " Stephen Boyd <sboyd\@codeaurora.org>\0"
-]
-[
- "Cc\0Catalin Marinas <catalin.marinas\@arm.com>",
- " Will Deacon <will.deacon\@arm.com>",
- " Ray Jui <rjui\@broadcom.com>",
- " Scott Branden <sbranden\@broadcom.com>",
- " Jon Mason <jonmason\@broadcom.com>",
- " Florian Fainelli <f.fainelli\@gmail.com>",
- " Oza Pawandeep <oza.oza\@broadcom.com>",
- " Srinath Mannam <srinath.mannam\@broadcom.com>",
- " Pramod Kumar <pramod.kumar\@broadcom.com>",
- " Sandeep Tripathy <sandeep.tripathy\@broadcom.com>",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-clk\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " bcm-kernel-feedback-list\@broadcom.com",
- " Anup Patel <anup.patel\@broadcom.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -71,7 +50,7 @@
"+\tcs-gpios = <&gpio_hsls 34 0>;\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tspi-flash\@0 {\n",
+ "+\tspi-flash at 0 {\n",
"+\t\tcompatible = \"jedec,spi-nor\";\n",
"+\t\treg = <0>;\n",
"+\t\tspi-max-frequency = <20000000>;\n",
@@ -86,7 +65,7 @@
"+\tcs-gpios = <&gpio_hsls 96 0>;\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tspi-flash\@0 {\n",
+ "+\tspi-flash at 0 {\n",
"+\t\tcompatible = \"jedec,spi-nor\";\n",
"+\t\treg = <0>;\n",
"+\t\tspi-max-frequency = <20000000>;\n",
@@ -102,7 +81,7 @@
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
" \n",
- "+\t\twdt0: watchdog\@000c0000 {\n",
+ "+\t\twdt0: watchdog at 000c0000 {\n",
"+\t\t\tcompatible = \"arm,sp805\", \"arm,primecell\";\n",
"+\t\t\treg = <0x000c0000 0x1000>;\n",
"+\t\t\tinterrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -110,14 +89,14 @@
"+\t\t\tclock-names = \"wdogclk\", \"apb_pclk\";\n",
"+\t\t};\n",
"+\n",
- " \t\tgpio_hsls: gpio\@000d0000 {\n",
+ " \t\tgpio_hsls: gpio at 000d0000 {\n",
" \t\t\tcompatible = \"brcm,iproc-gpio\";\n",
" \t\t\treg = <0x000d0000 0x864>;\n",
"\@\@ -359,11 +367,55 \@\@\n",
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
" \n",
- "+\t\tssp0: ssp\@00180000 {\n",
+ "+\t\tssp0: ssp at 00180000 {\n",
"+\t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n",
"+\t\t\treg = <0x00180000 0x1000>;\n",
"+\t\t\tinterrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -129,7 +108,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tssp1: ssp\@00190000 {\n",
+ "+\t\tssp1: ssp at 00190000 {\n",
"+\t\t\tcompatible = \"arm,pl022\", \"arm,primecell\";\n",
"+\t\t\treg = <0x00190000 0x1000>;\n",
"+\t\t\tinterrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -141,12 +120,12 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\thwrng: hwrng\@00220000 {\n",
+ " \t\thwrng: hwrng at 00220000 {\n",
" \t\t\tcompatible = \"brcm,iproc-rng200\";\n",
" \t\t\treg = <0x00220000 0x28>;\n",
" \t\t};\n",
" \n",
- "+\t\tdma0: dma\@00310000 {\n",
+ "+\t\tdma0: dma at 00310000 {\n",
"+\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n",
"+\t\t\treg = <0x00310000 0x1000>;\n",
"+\t\t\tinterrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -166,11 +145,11 @@
"+\t\t\tiommus = <&smmu 0x6000 0x0000>;\n",
"+\t\t};\n",
"+\n",
- " \t\tnand: nand\@00360000 {\n",
+ " \t\tnand: nand at 00360000 {\n",
" \t\t\tcompatible = \"brcm,nand-iproc\", \"brcm,brcmnand-v6.1\";\n",
" \t\t\treg = <0x00360000 0x600>,\n",
"-- \n",
"2.7.4"
]
-db330e367e9ce16472053f62c5bb19a2dc6a3d1a31eb01a782f0ca9da5ef636f
+5d4d035f46b8267bd73826993a55997eb43458bffaa3fae478e5696924be76f8
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.