diff for duplicates of <20161222112159.GY14217@n2100.armlinux.org.uk> diff --git a/a/1.txt b/N1/1.txt index 6953194..46a6b25 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ On Tue, Dec 13, 2016 at 06:48:40PM +0100, Gregory CLEMENT wrote: > > }; > -> + ap_sdhci0: sdhci@6e0000 { +> + ap_sdhci0: sdhci at 6e0000 { > + compatible = "marvell,armada-7000-sdhci"; > + reg = <0x6e0000 0x300>; > + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; @@ -16,7 +16,7 @@ On Tue, Dec 13, 2016 at 06:48:40PM +0100, Gregory CLEMENT wrote: > + 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 @@ -28,7 +28,7 @@ On Tue, Dec 13, 2016 at 06:48:40PM +0100, Gregory CLEMENT wrote: > status = "disabled"; > }; > + -> + cpm_sdhci0: sdhci@780000 { +> + cpm_sdhci0: sdhci at 780000 { > + compatible = "marvell,armada-7000-sdhci"; > + reg = <0x780000 0x300>; > + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; diff --git a/a/content_digest b/N1/content_digest index 60b0e7c..42d6bb7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,30 +1,9 @@ "ref\0cover.67d726f70f6bd48d38a2023513f2711080bc66c8.1481651244.git-series.gregory.clement@free-electrons.com\0" "ref\02564fe18eb9cc8a0a1a3311cdf7e7141f35211bd.1481651244.git-series.gregory.clement@free-electrons.com\0" - "From\0Russell King - ARM Linux <linux@armlinux.org.uk>\0" - "Subject\0Re: [PATCH v4 11/12] arm64: dts: marvell: add sdhci support for Armada 7K/8K\0" + "From\0linux@armlinux.org.uk (Russell King - ARM Linux)\0" + "Subject\0[PATCH v4 11/12] arm64: dts: marvell: add sdhci support for Armada 7K/8K\0" "Date\0Thu, 22 Dec 2016 11:21:59 +0000\0" - "To\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" - "Cc\0Ulf Hansson <ulf.hansson@linaro.org>" - Adrian Hunter <adrian.hunter@intel.com> - linux-mmc@vger.kernel.org - Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - Andrew Lunn <andrew@lunn.ch> - Yehuda Yitschak <yehuday@marvell.com> - Marcin Wojtas <mw@semihalf.com> - Jason Cooper <jason@lakedaemon.net> - Hanna Hawa <hannah@marvell.com> - Kostya Porotchkin <kostap@marvell.com> - Nadav Haklai <nadavh@marvell.com> - Ziji Hu <huziji@marvell.com> - Jimmy Xu <zmxu@marvell.com> - Doug Jones <dougj@marvell.com> - Ryan Gao <ygao@marvell.com> - Jisheng Zhang <jszhang@marvell.com> - Victor Gu <xigu@marvell.com> - Wei(SOCP) Liu <liuw@marvell.com> - Wilson Ding <dingwei@marvell.com> - linux-arm-kernel@lists.infradead.org - " Sebastian Hesselbarth <sebastian.hesselbarth@gm>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, Dec 13, 2016 at 06:48:40PM +0100, Gregory CLEMENT wrote:\n" @@ -36,7 +15,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-7000-sdhci\";\n" "> +\t\t\t\treg = <0x6e0000 0x300>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -45,7 +24,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" @@ -57,7 +36,7 @@ "> \t\t\t\tstatus = \"disabled\";\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-7000-sdhci\";\n" "> +\t\t\t\treg = <0x780000 0x300>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -75,4 +54,4 @@ "FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up\n" according to speedtest.net. -0ba2b96a6f9f79daab54d43a9128f14cb6c3687eb4b97f0bc3789297ffc17413 +0361503890b4bf7da3026c5ce4192078534796feb554b9ed327f985f516e21e4
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.