diff for duplicates of <20130111175545.GJ14149@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 91ba1ee..5193471 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ Acked-by: Tony Lindgren <tony@atomide.com> > @@ -120,6 +120,8 @@ > }; > -> ldo3_reg: regulator@5 { +> ldo3_reg: regulator at 5 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > regulator-always-on; @@ -43,7 +43,7 @@ Acked-by: Tony Lindgren <tony@atomide.com> > @@ -232,6 +232,8 @@ > }; > -> vmmc_reg: regulator@12 { +> vmmc_reg: regulator at 12 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > regulator-always-on; @@ -65,7 +65,7 @@ Acked-by: Tony Lindgren <tony@atomide.com> > @@ -244,7 +244,14 @@ > }; > -> vmmc_reg: regulator@12 { +> vmmc_reg: regulator at 12 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > regulator-always-on; @@ -85,7 +85,7 @@ Acked-by: Tony Lindgren <tony@atomide.com> > status = "disabled"; > }; > -> + mmc1: mmc@48060000 { +> + mmc1: mmc at 48060000 { > + compatible = "ti,omap3-hsmmc"; > + ti,hwmods = "mmc1"; > + ti,dual-volt; @@ -96,7 +96,7 @@ Acked-by: Tony Lindgren <tony@atomide.com> > + status = "disabled"; > + }; > + -> + mmc2: mmc@481d8000 { +> + mmc2: mmc at 481d8000 { > + compatible = "ti,omap3-hsmmc"; > + ti,hwmods = "mmc2"; > + ti,needs-special-reset; @@ -106,14 +106,14 @@ Acked-by: Tony Lindgren <tony@atomide.com> > + status = "disabled"; > + }; > + -> + mmc3: mmc@47810000 { +> + mmc3: mmc at 47810000 { > + compatible = "ti,omap3-hsmmc"; > + ti,hwmods = "mmc3"; > + ti,needs-special-reset; > + status = "disabled"; > + }; > + -> wdt2: wdt@44e35000 { +> wdt2: wdt at 44e35000 { > compatible = "ti,omap3-wdt"; > ti,hwmods = "wd_timer2"; > -- diff --git a/a/content_digest b/N1/content_digest index 3c37bcb..d9e39bc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,28 +1,9 @@ "ref\01357883330-5364-1-git-send-email-mporter@ti.com\0" "ref\01357883330-5364-12-git-send-email-mporter@ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH v4 11/14] ARM: dts: add AM33XX MMC support\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH v4 11/14] ARM: dts: add AM33XX MMC support\0" "Date\0Fri, 11 Jan 2013 09:55:45 -0800\0" - "To\0Matt Porter <mporter@ti.com>\0" - "Cc\0Sekhar Nori <nsekhar@ti.com>" - Grant Likely <grant.likely@secretlab.ca> - Mark Brown <broonie@opensource.wolfsonmicro.com> - Benoit Cousson <b-cousson@ti.com> - Russell King <linux@arm.linux.org.uk> - Vinod Koul <vinod.koul@intel.com> - Rob Landley <rob@landley.net> - Chris Ball <cjb@laptop.org> - Devicetree Discuss <devicetree-discuss@lists.ozlabs.org> - Linux OMAP List <linux-omap@vger.kernel.org> - Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org> - Linux DaVinci Kernel List <davinci-linux-open-source@linux.davincidsp.com> - Linux Kernel Mailing List <linux-kernel@vger.kernel.org> - Linux Documentation List <linux-doc@vger.kernel.org> - Linux MMC List <linux-mmc@vger.kernel.org> - Linux SPI Devel List <spi-devel-general@lists.sourceforge.net> - Arnd Bergmann <arnd@arndb.de> - Dan Williams <djbw@fb.com> - " Rob Herring <rob.herring@calxeda.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Matt Porter <mporter@ti.com> [130110 21:47]:\n" @@ -48,7 +29,7 @@ "> @@ -120,6 +120,8 @@\n" "> \t\t};\n" "> \n" - "> \t\tldo3_reg: regulator@5 {\n" + "> \t\tldo3_reg: regulator at 5 {\n" "> +\t\t\tregulator-min-microvolt = <1800000>;\n" "> +\t\t\tregulator-max-microvolt = <3300000>;\n" "> \t\t\tregulator-always-on;\n" @@ -70,7 +51,7 @@ "> @@ -232,6 +232,8 @@\n" "> \t\t};\n" "> \n" - "> \t\tvmmc_reg: regulator@12 {\n" + "> \t\tvmmc_reg: regulator at 12 {\n" "> +\t\t\tregulator-min-microvolt = <1800000>;\n" "> +\t\t\tregulator-max-microvolt = <3300000>;\n" "> \t\t\tregulator-always-on;\n" @@ -92,7 +73,7 @@ "> @@ -244,7 +244,14 @@\n" "> \t\t};\n" "> \n" - "> \t\tvmmc_reg: regulator@12 {\n" + "> \t\tvmmc_reg: regulator at 12 {\n" "> +\t\t\tregulator-min-microvolt = <1800000>;\n" "> +\t\t\tregulator-max-microvolt = <3300000>;\n" "> \t\t\tregulator-always-on;\n" @@ -112,7 +93,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> +\t\tmmc1: mmc@48060000 {\n" + "> +\t\tmmc1: mmc at 48060000 {\n" "> +\t\t\tcompatible = \"ti,omap3-hsmmc\";\n" "> +\t\t\tti,hwmods = \"mmc1\";\n" "> +\t\t\tti,dual-volt;\n" @@ -123,7 +104,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc2: mmc@481d8000 {\n" + "> +\t\tmmc2: mmc at 481d8000 {\n" "> +\t\t\tcompatible = \"ti,omap3-hsmmc\";\n" "> +\t\t\tti,hwmods = \"mmc2\";\n" "> +\t\t\tti,needs-special-reset;\n" @@ -133,18 +114,18 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc3: mmc@47810000 {\n" + "> +\t\tmmc3: mmc at 47810000 {\n" "> +\t\t\tcompatible = \"ti,omap3-hsmmc\";\n" "> +\t\t\tti,hwmods = \"mmc3\";\n" "> +\t\t\tti,needs-special-reset;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\twdt2: wdt@44e35000 {\n" + "> \t\twdt2: wdt at 44e35000 {\n" "> \t\t\tcompatible = \"ti,omap3-wdt\";\n" "> \t\t\tti,hwmods = \"wd_timer2\";\n" "> -- \n" "> 1.7.9.5\n" > -7d20f97770d74c6c106a7c3073807fc0aafc6ddd3aedc462134f3e22a6dbdeeb +fe054dd36916d8fceea6112c9d7d914482b875aad21ddc50dcb5c83cf72f52b1
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.