diff for duplicates of <08d6b21af1fd65783062c14e5896700d25c602f3.1490886907.git-series.gregory.clement@free-electrons.com>
diff --git a/a/content_digest b/N1/content_digest
index febb95b..6b90b6b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -37,10 +37,7 @@
" Victor Gu <xigu\@marvell.com>",
" Wei(SOCP) Liu <liuw\@marvell.com>",
" Wilson Ding <dingwei\@marvell.com>",
- " Yehuda Yitschak <yehuday\@marvell.com>",
- " Marcin Wojtas <mw\@semihalf.com>",
- " Hanna Hawa <hannah\@marvell.com>",
- " Kostya Porotchkin <kostap\@marvell.com>\0"
+ " Yehuda\0"
]
[
"\0000:1\0"
@@ -149,4 +146,4 @@
"git-series 0.9.1"
]
-95fccc2870bcba01712e2227eeb9e0aa8ae3f893c5a0b8f37705d84c6b52edaa
+0c5f0c2d2c96bac01ceffa76eea1ae3389600ffd7429dfba3133478835e80536
diff --git a/a/1.txt b/N2/1.txt
index e419d59..64c35c7 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -58,7 +58,7 @@ index 5019c8f4acd0..fe41bf9c301e 100644
};
-+ ap_sdhci0: sdhci@6e0000 {
++ ap_sdhci0: sdhci at 6e0000 {
+ compatible = "marvell,armada-ap806-sdhci";
+ reg = <0x6e0000 0x300>;
+ interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
@@ -69,7 +69,7 @@ index 5019c8f4acd0..fe41bf9c301e 100644
+ status = "disabled";
+ };
+
- ap_syscon: system-controller@6f4000 {
+ ap_syscon: system-controller at 6f4000 {
compatible = "marvell,ap806-system-controller",
"syscon";
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -81,7 +81,7 @@ index 3a99c36433d6..f07ea5aeac48 100644
status = "okay";
};
+
-+ cpm_sdhci0: sdhci@780000 {
++ cpm_sdhci0: sdhci at 780000 {
+ compatible = "marvell,armada-cp110-sdhci";
+ reg = <0x780000 0x300>;
+ interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
@@ -93,6 +93,6 @@ index 3a99c36433d6..f07ea5aeac48 100644
+
};
- cpm_pcie0: pcie@f2600000 {
+ cpm_pcie0: pcie at f2600000 {
--
git-series 0.9.1
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index febb95b..0f762a2 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0cover.51071caa64e5df81264a91b9a81ed1e94f47d2c4.1490886907.git-series.gregory.clement\@free-electrons.com\0"
]
[
- "From\0Gregory CLEMENT <gregory.clement\@free-electrons.com>\0"
+ "From\0gregory.clement\@free-electrons.com (Gregory CLEMENT)\0"
]
[
"Subject\0[PATCH v7 12/13] arm64: dts: marvell: add sdhci support for Armada 7K/8K\0"
@@ -11,36 +11,7 @@
"Date\0Thu, 30 Mar 2017 17:23:04 +0200\0"
]
[
- "To\0Ulf Hansson <ulf.hansson\@linaro.org>",
- " Adrian Hunter <adrian.hunter\@intel.com>",
- " linux-mmc\@vger.kernel.org\0"
-]
-[
- "Cc\0Jason Cooper <jason\@lakedaemon.net>",
- " Andrew Lunn <andrew\@lunn.ch>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Gregory CLEMENT <gregory.clement\@free-electrons.com>",
- " Thomas Petazzoni <thomas.petazzoni\@free-electrons.com>",
- " linux-arm-kernel\@lists.infradead.org",
- " Mike Turquette <mturquette\@baylibre.com>",
- " Stephen Boyd <sboyd\@codeaurora.org>",
- " linux-clk\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " devicetree\@vger.kernel.org",
- " Ziji Hu <huziji\@marvell.com>",
- " Jimmy Xu <zmxu\@marvell.com>",
- " Jisheng Zhang <jszhang\@marvell.com>",
- " Nadav Haklai <nadavh\@marvell.com>",
- " Ryan Gao <ygao\@marvell.com>",
- " Doug Jones <dougj\@marvell.com>",
- " Victor Gu <xigu\@marvell.com>",
- " Wei(SOCP) Liu <liuw\@marvell.com>",
- " Wilson Ding <dingwei\@marvell.com>",
- " Yehuda Yitschak <yehuday\@marvell.com>",
- " Marcin Wojtas <mw\@semihalf.com>",
- " Hanna Hawa <hannah\@marvell.com>",
- " Kostya Porotchkin <kostap\@marvell.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -109,7 +80,7 @@
" \n",
" \t\t\t};\n",
" \n",
- "+\t\t\tap_sdhci0: sdhci\@6e0000 {\n",
+ "+\t\t\tap_sdhci0: sdhci at 6e0000 {\n",
"+\t\t\t\tcompatible = \"marvell,armada-ap806-sdhci\";\n",
"+\t\t\t\treg = <0x6e0000 0x300>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -120,7 +91,7 @@
"+\t\t\t\tstatus = \"disabled\";\n",
"+\t\t\t};\n",
"+\n",
- " \t\t\tap_syscon: system-controller\@6f4000 {\n",
+ " \t\t\tap_syscon: system-controller at 6f4000 {\n",
" \t\t\t\tcompatible = \"marvell,ap806-system-controller\",\n",
" \t\t\t\t\t \"syscon\";\n",
"diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi\n",
@@ -132,7 +103,7 @@
" \t\t\t\tstatus = \"okay\";\n",
" \t\t\t};\n",
"+\n",
- "+\t\t\tcpm_sdhci0: sdhci\@780000 {\n",
+ "+\t\t\tcpm_sdhci0: sdhci at 780000 {\n",
"+\t\t\t\tcompatible = \"marvell,armada-cp110-sdhci\";\n",
"+\t\t\t\treg = <0x780000 0x300>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -144,9 +115,9 @@
"+\n",
" \t\t};\n",
" \n",
- " \t\tcpm_pcie0: pcie\@f2600000 {\n",
+ " \t\tcpm_pcie0: pcie at f2600000 {\n",
"-- \n",
"git-series 0.9.1"
]
-95fccc2870bcba01712e2227eeb9e0aa8ae3f893c5a0b8f37705d84c6b52edaa
+d0f4c7de0c2bd4bba38a902051d5fac279ab242f8823724bc8aebd1ee686067b
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.