diff for duplicates of <1394036628.23289.0.camel@linux-builds1> diff --git a/a/1.txt b/N1/1.txt index 0a7567a..1b6ee32 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Wed, 2014-03-05 at 17:23 +0100, ZY - pavel wrote: > Add DTS binding for MMC on socfpga boards. Tested on Sockit. > -> Signed-off-by: Pavel Machek <pavel@denx.de> +> Signed-off-by: Pavel Machek <pavel-ynQEQJNshbs@public.gmane.org> > > diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi > index 537f1a5..cad7526 100644 @@ -11,7 +11,7 @@ On Wed, 2014-03-05 at 17:23 +0100, ZY - pavel wrote: > reg-io-width = <4>; > }; > -> + mmc: dwmmc0 at ff704000 { +> + mmc: dwmmc0@ff704000 { > + compatible = "snps,dw-mshc"; > + reg = <0xff704000 0x1000>; > + interrupts = <0 139 4>; @@ -22,13 +22,13 @@ On Wed, 2014-03-05 at 17:23 +0100, ZY - pavel wrote: > + supports-highspeed; > + broken-cd; > + fifo-depth = <0x400>; -> + slot at 0 { +> + slot@0 { > + reg = <0>; > + bus-width = <4>; > + }; > + }; > + -> rstmgr at ffd05000 { +> rstmgr@ffd05000 { > compatible = "altr,rst-mgr"; > reg = <0xffd05000 0x1000>; > @@ -37,3 +37,9 @@ This is already queued in Chris Ball's MMC tree. Thanks, Dinh + + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 9c5256d..e30f01a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,23 @@ "ref\020140305162350.GA3674@pollux.denx.de\0" - "From\0dinguyen@altera.com (Dinh Nguyen)\0" - "Subject\0[PATCH] dts: add support for MMC on socfpga boards\0" + "ref\020140305162350.GA3674-E0MFdw8UecLj/ljBK/0BTg@public.gmane.org\0" + "From\0Dinh Nguyen <dinguyen-EIB2kfCEclfQT0dZR+AlfA@public.gmane.org>\0" + "Subject\0Re: [PATCH] dts: add support for MMC on socfpga boards\0" "Date\0Wed, 5 Mar 2014 10:23:48 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0ZY - pavel <pavel-ynQEQJNshbs@public.gmane.org>\0" + "Cc\0linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + pawel.moll-5wv7dgnIgG8@public.gmane.org + " robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org\0" "\00:1\0" "b\0" "On Wed, 2014-03-05 at 17:23 +0100, ZY - pavel wrote:\n" "> Add DTS binding for MMC on socfpga boards. Tested on Sockit.\n" "> \n" - "> Signed-off-by: Pavel Machek <pavel@denx.de>\n" + "> Signed-off-by: Pavel Machek <pavel-ynQEQJNshbs@public.gmane.org>\n" "> \n" "> diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi\n" "> index 537f1a5..cad7526 100644\n" @@ -18,7 +27,7 @@ "> \t\t\treg-io-width = <4>;\n" "> \t\t};\n" "> \n" - "> +\t\tmmc: dwmmc0 at ff704000 {\n" + "> +\t\tmmc: dwmmc0@ff704000 {\n" "> +\t\t\tcompatible = \"snps,dw-mshc\";\n" "> +\t\t\treg = <0xff704000 0x1000>;\n" "> +\t\t\tinterrupts = <0 139 4>;\n" @@ -29,13 +38,13 @@ "> +\t\t\tsupports-highspeed;\n" "> +\t\t\tbroken-cd;\n" "> +\t\t\tfifo-depth = <0x400>;\n" - "> +\t\t\tslot at 0 {\n" + "> +\t\t\tslot@0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t\tbus-width = <4>;\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\trstmgr at ffd05000 {\n" + "> \t\trstmgr@ffd05000 {\n" "> \t\t\tcompatible = \"altr,rst-mgr\";\n" "> \t\t\treg = <0xffd05000 0x1000>;\n" "> \n" @@ -43,6 +52,12 @@ "This is already queued in Chris Ball's MMC tree.\n" "\n" "Thanks,\n" - Dinh + "Dinh\n" + "\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -b73cea9f72789c25df2ac2707278a62e03ed8b1069fad4acd4afb5ad89da8df8 +adffcf9baf54c843c75b9a0049b549d4ce300070c013c12ec3cdcf5cc4db8cfc
diff --git a/a/1.txt b/N2/1.txt index 0a7567a..15594e3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,7 +11,7 @@ On Wed, 2014-03-05 at 17:23 +0100, ZY - pavel wrote: > reg-io-width = <4>; > }; > -> + mmc: dwmmc0 at ff704000 { +> + mmc: dwmmc0@ff704000 { > + compatible = "snps,dw-mshc"; > + reg = <0xff704000 0x1000>; > + interrupts = <0 139 4>; @@ -22,13 +22,13 @@ On Wed, 2014-03-05 at 17:23 +0100, ZY - pavel wrote: > + supports-highspeed; > + broken-cd; > + fifo-depth = <0x400>; -> + slot at 0 { +> + slot@0 { > + reg = <0>; > + bus-width = <4>; > + }; > + }; > + -> rstmgr at ffd05000 { +> rstmgr@ffd05000 { > compatible = "altr,rst-mgr"; > reg = <0xffd05000 0x1000>; > diff --git a/a/content_digest b/N2/content_digest index 9c5256d..5cf9a68 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,16 @@ "ref\020140305162350.GA3674@pollux.denx.de\0" - "From\0dinguyen@altera.com (Dinh Nguyen)\0" - "Subject\0[PATCH] dts: add support for MMC on socfpga boards\0" + "From\0Dinh Nguyen <dinguyen@altera.com>\0" + "Subject\0Re: [PATCH] dts: add support for MMC on socfpga boards\0" "Date\0Wed, 5 Mar 2014 10:23:48 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0ZY - pavel <pavel@denx.de>\0" + "Cc\0<linux-kernel@vger.kernel.org>" + <linux-arm-kernel@lists.infradead.org> + <devicetree@vger.kernel.org> + <galak@codeaurora.org> + <ijc+devicetree@hellion.org.uk> + <mark.rutland@arm.com> + <pawel.moll@arm.com> + " <robh+dt@kernel.org>\0" "\00:1\0" "b\0" "On Wed, 2014-03-05 at 17:23 +0100, ZY - pavel wrote:\n" @@ -18,7 +26,7 @@ "> \t\t\treg-io-width = <4>;\n" "> \t\t};\n" "> \n" - "> +\t\tmmc: dwmmc0 at ff704000 {\n" + "> +\t\tmmc: dwmmc0@ff704000 {\n" "> +\t\t\tcompatible = \"snps,dw-mshc\";\n" "> +\t\t\treg = <0xff704000 0x1000>;\n" "> +\t\t\tinterrupts = <0 139 4>;\n" @@ -29,13 +37,13 @@ "> +\t\t\tsupports-highspeed;\n" "> +\t\t\tbroken-cd;\n" "> +\t\t\tfifo-depth = <0x400>;\n" - "> +\t\t\tslot at 0 {\n" + "> +\t\t\tslot@0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t\tbus-width = <4>;\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\trstmgr at ffd05000 {\n" + "> \t\trstmgr@ffd05000 {\n" "> \t\t\tcompatible = \"altr,rst-mgr\";\n" "> \t\t\treg = <0xffd05000 0x1000>;\n" "> \n" @@ -45,4 +53,4 @@ "Thanks,\n" Dinh -b73cea9f72789c25df2ac2707278a62e03ed8b1069fad4acd4afb5ad89da8df8 +be49ed78586dbc65b0f91341a38ff6a3656919de04c3375835695bb5e8ca451b
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.