diff for duplicates of <20140305162350.GA3674@pollux.denx.de> diff --git a/a/1.txt b/N1/1.txt index 49ab459..38f9c2c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ 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 @@ index 537f1a5..cad7526 100644 reg-io-width = <4>; }; -+ mmc: dwmmc0 at ff704000 { ++ mmc: dwmmc0@ff704000 { + compatible = "snps,dw-mshc"; + reg = <0xff704000 0x1000>; + interrupts = <0 139 4>; @@ -22,12 +22,16 @@ index 537f1a5..cad7526 100644 + 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>; +-- +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 77c3b55..9b76efe 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,21 @@ - "From\0pavel@denx.de (Pavel Machek)\0" + "From\0Pavel Machek <pavel-ynQEQJNshbs@public.gmane.org>\0" "Subject\0[PATCH] dts: add support for MMC on socfpga boards\0" "Date\0Wed, 5 Mar 2014 17:23:50 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\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 + " dinguyen-EIB2kfCEclfQT0dZR+AlfA@public.gmane.org\0" "\00:1\0" "b\0" "\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" @@ -17,7 +25,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" @@ -28,14 +36,18 @@ "+\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>;" + " \t\t\treg = <0xffd05000 0x1000>;\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 -8d680d5f92680a670359bb9032df087161b113a295ff239ad34a0e0c3414aa94 +58aa9cea05b57edcce9871f335222c3c6b01283740fd1e7ba19c83b49f8f2949
diff --git a/a/1.txt b/N2/1.txt index 49ab459..6048a6c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,7 +11,7 @@ index 537f1a5..cad7526 100644 reg-io-width = <4>; }; -+ mmc: dwmmc0 at ff704000 { ++ mmc: dwmmc0@ff704000 { + compatible = "snps,dw-mshc"; + reg = <0xff704000 0x1000>; + interrupts = <0 139 4>; @@ -22,12 +22,12 @@ index 537f1a5..cad7526 100644 + 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 77c3b55..683987f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,15 @@ - "From\0pavel@denx.de (Pavel Machek)\0" + "From\0Pavel Machek <pavel@denx.de>\0" "Subject\0[PATCH] dts: add support for MMC on socfpga boards\0" "Date\0Wed, 5 Mar 2014 17:23:50 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-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 + " dinguyen@altera.com\0" "\00:1\0" "b\0" "\n" @@ -17,7 +25,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" @@ -28,14 +36,14 @@ "+\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>;" -8d680d5f92680a670359bb9032df087161b113a295ff239ad34a0e0c3414aa94 +7781c9b44b5e4f63173cb9f93c49b692909fea7914314b39003f9112e6ef4e93
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.