diff for duplicates of <52CF6D82.6020007@samsung.com> diff --git a/a/1.txt b/N1/1.txt index 663fe9a..7560b22 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ Acked-by: Jaehoon Chung <jh80.chung@samsung.com> -On 01/10/2014 06:31 AM, dinguyen@altera.com wrote: +On 01/10/2014 06:31 AM, dinguyen at altera.com wrote: > From: Dinh Nguyen <dinguyen@altera.com> > > Use the "snps,dw-mshc" binding to enable the dw_mmc driver. @@ -34,7 +34,7 @@ On 01/10/2014 06:31 AM, dinguyen@altera.com wrote: > cache-level = <2>; > }; > -> + mmc: dwmmc0@ff704000 { +> + mmc: dwmmc0 at ff704000 { > + compatible = "snps,dw-mshc"; > + reg = <0xff704000 0x1000>; > + interrupts = <0 139 4>; @@ -46,12 +46,12 @@ On 01/10/2014 06:31 AM, dinguyen@altera.com wrote: > + }; > + > /* Local timer */ -> timer@fffec600 { +> timer at fffec600 { > compatible = "arm,cortex-a9-twd-timer"; > @@ -524,7 +535,7 @@ > }; > -> sysmgr@ffd08000 { +> sysmgr at ffd08000 { > - compatible = "altr,sys-mgr"; > + compatible = "altr,sys-mgr", "syscon"; > reg = <0xffd08000 0x4000>; @@ -65,18 +65,18 @@ On 01/10/2014 06:31 AM, dinguyen@altera.com wrote: > }; > }; > -> + dwmmc0@ff704000 { +> + dwmmc0 at ff704000 { > + num-slots = <1>; > + supports-highspeed; > + broken-cd; > + -> + slot@0 { +> + slot at 0 { > + reg = <0>; > + bus-width = <4>; > + }; > + }; > + -> serial0@ffc02000 { +> serial0 at ffc02000 { > clock-frequency = <100000000>; > }; > diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi @@ -87,18 +87,18 @@ On 01/10/2014 06:31 AM, dinguyen@altera.com wrote: > }; > }; > -> + dwmmc0@ff704000 { +> + dwmmc0 at ff704000 { > + num-slots = <1>; > + supports-highspeed; > + broken-cd; > + -> + slot@0 { +> + slot at 0 { > + reg = <0>; > + bus-width = <4>; > + }; > + }; > + -> ethernet@ff702000 { +> ethernet at ff702000 { > phy-mode = "rgmii"; > phy-addr = <0xffffffff>; /* probe for phy addr */ > diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts @@ -109,18 +109,18 @@ On 01/10/2014 06:31 AM, dinguyen@altera.com wrote: > }; > }; > -> + dwmmc0@ff704000 { +> + dwmmc0 at ff704000 { > + num-slots = <1>; > + supports-highspeed; > + broken-cd; > + -> + slot@0 { +> + slot at 0 { > + reg = <0>; > + bus-width = <4>; > + }; > + }; > + -> ethernet@ff700000 { +> ethernet at ff700000 { > phy-mode = "gmii"; > status = "okay"; > diff --git a/a/content_digest b/N1/content_digest index d6d5c24..bed5252 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,28 +1,14 @@ "ref\01389303079-19808-1-git-send-email-dinguyen@altera.com\0" "ref\01389303079-19808-3-git-send-email-dinguyen@altera.com\0" - "From\0Jaehoon Chung <jh80.chung@samsung.com>\0" - "Subject\0Re: [PATCHv9 2/4] dts: socfpga: Add support for SD/MMC on the SOCFPGA platform\0" + "From\0jh80.chung@samsung.com (Jaehoon Chung)\0" + "Subject\0[PATCHv9 2/4] dts: socfpga: Add support for SD/MMC on the SOCFPGA platform\0" "Date\0Fri, 10 Jan 2014 12:48:18 +0900\0" - "To\0dinguyen@altera.com" - dinh.linux@gmail.com - arnd@arndb.de - cjb@laptop.org - jh80.chung@samsung.com - tgih.jun@samsung.com - heiko@sntech.de - dianders@chromium.org - alim.akhtar@samsung.com - bzhao@marvell.com - " mturquette@linaro.org\0" - "Cc\0zhangfei.gao@linaro.org" - linux-mmc@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Acked-by: Jaehoon Chung <jh80.chung@samsung.com>\n" "\n" - "On 01/10/2014 06:31 AM, dinguyen@altera.com wrote:\n" + "On 01/10/2014 06:31 AM, dinguyen at altera.com wrote:\n" "> From: Dinh Nguyen <dinguyen@altera.com>\n" "> \n" "> Use the \"snps,dw-mshc\" binding to enable the dw_mmc driver.\n" @@ -56,7 +42,7 @@ "> \t\t\tcache-level = <2>;\n" "> \t\t};\n" "> \n" - "> +\t\tmmc: dwmmc0@ff704000 {\n" + "> +\t\tmmc: dwmmc0 at ff704000 {\n" "> +\t\t\tcompatible = \"snps,dw-mshc\";\n" "> +\t\t\treg = <0xff704000 0x1000>;\n" "> +\t\t\tinterrupts = <0 139 4>;\n" @@ -68,12 +54,12 @@ "> +\t\t};\n" "> +\n" "> \t\t/* Local timer */\n" - "> \t\ttimer@fffec600 {\n" + "> \t\ttimer at fffec600 {\n" "> \t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> @@ -524,7 +535,7 @@\n" "> \t\t};\n" "> \n" - "> \t\tsysmgr@ffd08000 {\n" + "> \t\tsysmgr at ffd08000 {\n" "> -\t\t\t\tcompatible = \"altr,sys-mgr\";\n" "> +\t\t\t\tcompatible = \"altr,sys-mgr\", \"syscon\";\n" "> \t\t\t\treg = <0xffd08000 0x4000>;\n" @@ -87,18 +73,18 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tdwmmc0@ff704000 {\n" + "> +\t\tdwmmc0 at ff704000 {\n" "> +\t\t\tnum-slots = <1>;\n" "> +\t\t\tsupports-highspeed;\n" "> +\t\t\tbroken-cd;\n" "> +\n" - "> +\t\t\tslot@0 {\n" + "> +\t\t\tslot at 0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t\tbus-width = <4>;\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tserial0@ffc02000 {\n" + "> \t\tserial0 at ffc02000 {\n" "> \t\t\tclock-frequency = <100000000>;\n" "> \t\t};\n" "> diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi\n" @@ -109,18 +95,18 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tdwmmc0@ff704000 {\n" + "> +\t\tdwmmc0 at ff704000 {\n" "> +\t\t\tnum-slots = <1>;\n" "> +\t\t\tsupports-highspeed;\n" "> +\t\t\tbroken-cd;\n" "> +\n" - "> +\t\t\tslot@0 {\n" + "> +\t\t\tslot at 0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t\tbus-width = <4>;\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tethernet@ff702000 {\n" + "> \t\tethernet at ff702000 {\n" "> \t\t\tphy-mode = \"rgmii\";\n" "> \t\t\tphy-addr = <0xffffffff>; /* probe for phy addr */\n" "> diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts\n" @@ -131,20 +117,20 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tdwmmc0@ff704000 {\n" + "> +\t\tdwmmc0 at ff704000 {\n" "> +\t\t\tnum-slots = <1>;\n" "> +\t\t\tsupports-highspeed;\n" "> +\t\t\tbroken-cd;\n" "> +\n" - "> +\t\t\tslot@0 {\n" + "> +\t\t\tslot at 0 {\n" "> +\t\t\t\treg = <0>;\n" "> +\t\t\t\tbus-width = <4>;\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tethernet@ff700000 {\n" + "> \t\tethernet at ff700000 {\n" "> \t\t\tphy-mode = \"gmii\";\n" "> \t\t\tstatus = \"okay\";\n" > -cbb6983a2448cd3c01a6769b55031ed580178d09a0feabf5603a8173a37d437d +80ff053588111dd5054ed9c54930aa627ed1bf6683015e6abaff45a83b246bcf
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.