diff for duplicates of <201203301136.05038.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index 0d41004..293e03c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,7 +39,7 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de> + +Example: + -+sdhci@ab000000 { ++sdhci at ab000000 { + compatible = "sdhci"; + reg = <0xab000000 0x200>; + interrupts = <23>; @@ -113,7 +113,7 @@ index 7e51154..690a226 100644 Example: -@@ -23,5 +23,5 @@ sdhci@c8000200 { +@@ -23,5 +23,5 @@ sdhci at c8000200 { cd-gpios = <&gpio 69 0>; /* gpio PI5 */ wp-gpios = <&gpio 57 0>; /* gpio PH1 */ power-gpios = <&gpio 155 0>; /* gpio PT3 */ @@ -153,7 +153,7 @@ index c7ee86c..139138a 100644 @@ -35,7 +35,7 @@ }; - esdhc@50008000 { /* ESDHC2 */ + esdhc at 50008000 { /* ESDHC2 */ - fsl,card-wired; + non-removable; status = "okay"; @@ -162,7 +162,7 @@ index c7ee86c..139138a 100644 @@ -76,7 +76,7 @@ }; - esdhc@50020000 { /* ESDHC3 */ + esdhc at 50020000 { /* ESDHC3 */ - fsl,card-wired; + non-removable; status = "okay"; @@ -175,7 +175,7 @@ index ce1c823..d2eaf52 100644 @@ -41,7 +41,7 @@ }; - usdhc@0219c000 { /* uSDHC4 */ + usdhc at 0219c000 { /* uSDHC4 */ - fsl,card-wired; + non-removable; vmmc-supply = <®_3p3v>; @@ -252,10 +252,10 @@ index ac3fb75..67c6511 100644 + bus-width = <4>; }; - sdhci@78000200 { + sdhci at 78000200 { @@ -66,5 +67,6 @@ - sdhci@78000400 { + sdhci at 78000400 { support-8bit; + bus-width = <8>; }; @@ -271,7 +271,7 @@ index 6e8447d..e9cae68 100644 + bus-width = <4>; }; - sdhci@c8000400 { + sdhci at c8000400 { @@ -111,5 +112,6 @@ wp-gpios = <&gpio 59 0>; /* gpio PH3 */ power-gpios = <&gpio 70 0>; /* gpio PI6 */ @@ -290,10 +290,10 @@ index 6c02abb..03d3d79 100644 + bus-width = <4>; }; - sdhci@c8000200 { + sdhci at c8000200 { @@ -109,6 +110,7 @@ - sdhci@c8000600 { + sdhci at c8000600 { support-8bit; + bus-width = <8>; }; @@ -310,12 +310,12 @@ index dbf1c5a..8decf72 100644 + bus-width = <4>; }; - sdhci@c8000600 { + sdhci at c8000600 { support-8bit; + bus-width = <8>; }; - usb@c5000000 { + usb at c5000000 { diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts index 2dcff87..29e54c7 100644 --- a/arch/arm/boot/dts/tegra-ventana.dts @@ -327,7 +327,7 @@ index 2dcff87..29e54c7 100644 + bus-width = <4>; }; - sdhci@c8000600 { + sdhci at c8000600 { support-8bit; + bus-width = <8>; }; @@ -337,13 +337,13 @@ index 7e283c8..fe0d609 100644 --- a/arch/powerpc/boot/dts/mpc8569mds.dts +++ b/arch/powerpc/boot/dts/mpc8569mds.dts @@ -119,6 +119,7 @@ - sdhc@2e000 { + sdhc at 2e000 { status = "disabled"; sdhci,1-bit-only; + bus-width = <1>; }; - par_io@e0100 { + par_io at e0100 { diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 47adb16..ae48fc7 100644 --- a/drivers/mmc/host/omap_hsmmc.c diff --git a/a/content_digest b/N1/content_digest index 3c61351..aec5fe0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,10 @@ "ref\01328032576-9269-1-git-send-email-thomas.abraham@linaro.org\0" "ref\0201203271619.13320.arnd@arndb.de\0" "ref\04F7553D1.4030008@st.com\0" - "From\0Arnd Bergmann <arnd@arndb.de>\0" - "Subject\0Re: [PATCH v3 6/6] mmc: sdhci-s3c: Add device tree support\0" + "From\0arnd@arndb.de (Arnd Bergmann)\0" + "Subject\0[PATCH v3 6/6] mmc: sdhci-s3c: Add device tree support\0" "Date\0Fri, 30 Mar 2012 11:36:04 +0000\0" - "To\0Viresh Kumar <viresh.kumar@st.com>\0" - "Cc\0Thomas Abraham <thomas.abraham@linaro.org>" - cjb@laptop.org <cjb@laptop.org> - Lee Jones <lee.jones@linaro.org> - Rajendra Nayak <rnayak@ti.com> - Stephen Warren <swarren@nvidia.com> - Shawn Guo <shawn.guo@linaro.org> - Anton Vorontsov <anton.vorontsov@linaro.org> - linux-mmc@vger.kernel.org <linux-mmc@vger.kernel.org> - devicetree-discuss@lists.ozlabs.org <devicetree-discuss@lists.ozlabs.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - grant.likely@secretlab.ca <grant.likely@secretlab.ca> - rob.herring@calxeda.com <rob.herring@calxeda.com> - linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org> - kgene.kim@samsung.com <kgene.kim@samsung.com> - ben-linux@fluff.org <ben-linux@fluff.org> - " patches@linaro.org <patches@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Friday 30 March 2012, Viresh Kumar wrote:\n" @@ -64,7 +48,7 @@ "+\n" "+Example:\n" "+\n" - "+sdhci@ab000000 {\n" + "+sdhci at ab000000 {\n" "+\tcompatible = \"sdhci\";\n" "+\treg = <0xab000000 0x200>;\n" "+\tinterrupts = <23>;\n" @@ -138,7 +122,7 @@ " \n" " Example:\n" " \n" - "@@ -23,5 +23,5 @@ sdhci@c8000200 {\n" + "@@ -23,5 +23,5 @@ sdhci at c8000200 {\n" " \tcd-gpios = <&gpio 69 0>; /* gpio PI5 */\n" " \twp-gpios = <&gpio 57 0>; /* gpio PH1 */\n" " \tpower-gpios = <&gpio 155 0>; /* gpio PT3 */\n" @@ -178,7 +162,7 @@ "@@ -35,7 +35,7 @@\n" " \t\t\t\t};\n" " \n" - " \t\t\t\tesdhc@50008000 { /* ESDHC2 */\n" + " \t\t\t\tesdhc at 50008000 { /* ESDHC2 */\n" "-\t\t\t\t\tfsl,card-wired;\n" "+\t\t\t\t\tnon-removable;\n" " \t\t\t\t\tstatus = \"okay\";\n" @@ -187,7 +171,7 @@ "@@ -76,7 +76,7 @@\n" " \t\t\t\t};\n" " \n" - " \t\t\t\tesdhc@50020000 { /* ESDHC3 */\n" + " \t\t\t\tesdhc at 50020000 { /* ESDHC3 */\n" "-\t\t\t\t\tfsl,card-wired;\n" "+\t\t\t\t\tnon-removable;\n" " \t\t\t\t\tstatus = \"okay\";\n" @@ -200,7 +184,7 @@ "@@ -41,7 +41,7 @@\n" " \t\t\t};\n" " \n" - " \t\t\tusdhc@0219c000 { /* uSDHC4 */\n" + " \t\t\tusdhc at 0219c000 { /* uSDHC4 */\n" "-\t\t\t\tfsl,card-wired;\n" "+\t\t\t\tnon-removable;\n" " \t\t\t\tvmmc-supply = <®_3p3v>;\n" @@ -277,10 +261,10 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@78000200 {\n" + " \tsdhci at 78000200 {\n" "@@ -66,5 +67,6 @@\n" " \n" - " \tsdhci@78000400 {\n" + " \tsdhci at 78000400 {\n" " \t\tsupport-8bit;\n" "+\t\tbus-width = <8>;\n" " \t};\n" @@ -296,7 +280,7 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000400 {\n" + " \tsdhci at c8000400 {\n" "@@ -111,5 +112,6 @@\n" " \t\twp-gpios = <&gpio 59 0>; /* gpio PH3 */\n" " \t\tpower-gpios = <&gpio 70 0>; /* gpio PI6 */\n" @@ -315,10 +299,10 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000200 {\n" + " \tsdhci at c8000200 {\n" "@@ -109,6 +110,7 @@\n" " \n" - " \tsdhci@c8000600 {\n" + " \tsdhci at c8000600 {\n" " \t\tsupport-8bit;\n" "+\t\tbus-width = <8>;\n" " \t};\n" @@ -335,12 +319,12 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000600 {\n" + " \tsdhci at c8000600 {\n" " \t\tsupport-8bit;\n" "+\t\tbus-width = <8>;\n" " \t};\n" " \n" - " \tusb@c5000000 {\n" + " \tusb at c5000000 {\n" "diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts\n" "index 2dcff87..29e54c7 100644\n" "--- a/arch/arm/boot/dts/tegra-ventana.dts\n" @@ -352,7 +336,7 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000600 {\n" + " \tsdhci at c8000600 {\n" " \t\tsupport-8bit;\n" "+\t\tbus-width = <8>;\n" " \t};\n" @@ -362,13 +346,13 @@ "--- a/arch/powerpc/boot/dts/mpc8569mds.dts\n" "+++ b/arch/powerpc/boot/dts/mpc8569mds.dts\n" "@@ -119,6 +119,7 @@\n" - " \t\tsdhc@2e000 {\n" + " \t\tsdhc at 2e000 {\n" " \t\t\tstatus = \"disabled\";\n" " \t\t\tsdhci,1-bit-only;\n" "+\t\t\tbus-width = <1>;\n" " \t\t};\n" " \n" - " \t\tpar_io@e0100 {\n" + " \t\tpar_io at e0100 {\n" "diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c\n" "index 47adb16..ae48fc7 100644\n" "--- a/drivers/mmc/host/omap_hsmmc.c\n" @@ -428,4 +412,4 @@ " \n" " \t\tif (sdhci_of_wp_inverted(np))" -eacd1b8ba65e3091abbdeb8b569090b1e6eccd605fa8d93fc783d6ce94b24870 +b4ce94868ce448624134e712b22b4f6f3e48056eaee570b1204885ed676f9109
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.