diff for duplicates of <871umou38f.fsf_-_@laptop.org> diff --git a/a/1.txt b/N1/1.txt index ba1e79c..93c5e67 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -122,7 +122,7 @@ index 0000000..6e70dcd + +Example: + -+sdhci@ab000000 { ++sdhci at ab000000 { + compatible = "sdhci"; + reg = <0xab000000 0x200>; + interrupts = <23>; @@ -150,7 +150,7 @@ index 7e51154..f77c303 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 */ @@ -186,7 +186,7 @@ index c7ee86c..139138a 100644 @@ -35,7 +35,7 @@ }; - esdhc@50008000 { /* ESDHC2 */ + esdhc at 50008000 { /* ESDHC2 */ - fsl,card-wired; + non-removable; status = "okay"; @@ -195,7 +195,7 @@ index c7ee86c..139138a 100644 @@ -76,7 +76,7 @@ }; - esdhc@50020000 { /* ESDHC3 */ + esdhc at 50020000 { /* ESDHC3 */ - fsl,card-wired; + non-removable; status = "okay"; @@ -208,7 +208,7 @@ index ce1c823..d2eaf52 100644 @@ -41,7 +41,7 @@ }; - usdhc@0219c000 { /* uSDHC4 */ + usdhc at 0219c000 { /* uSDHC4 */ - fsl,card-wired; + non-removable; vmmc-supply = <®_3p3v>; @@ -285,15 +285,15 @@ index facb950..f00480a 100644 + bus-width = <4>; }; - sdhci@78000200 { + sdhci at 78000200 { @@ -141,6 +142,7 @@ - sdhci@78000400 { + sdhci at 78000400 { support-8bit; + bus-width = <8>; }; - ahub@70080000 { + ahub at 70080000 { diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index 6857cec..7cd513a 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts @@ -305,7 +305,7 @@ index 6857cec..7cd513a 100644 + bus-width = <4>; }; - sdhci@c8000400 { + sdhci at c8000400 { @@ -335,6 +336,7 @@ wp-gpios = <&gpio 59 0>; /* gpio PH3 */ power-gpios = <&gpio 70 0>; /* gpio PI6 */ @@ -313,7 +313,7 @@ index 6857cec..7cd513a 100644 + bus-width = <8>; }; - usb@c5004000 { + usb at c5004000 { diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 34a9177..8d625e4 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts @@ -325,10 +325,10 @@ index 34a9177..8d625e4 100644 + bus-width = <4>; }; - sdhci@c8000200 { + sdhci at c8000200 { @@ -325,6 +326,7 @@ - sdhci@c8000600 { + sdhci at c8000600 { support-8bit; + bus-width = <8>; }; @@ -345,12 +345,12 @@ index c4d171e..38e40a1 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 c20d5e9..149ab6d 100644 --- a/arch/arm/boot/dts/tegra-ventana.dts @@ -362,24 +362,24 @@ index c20d5e9..149ab6d 100644 + bus-width = <4>; }; - sdhci@c8000600 { + sdhci at c8000600 { support-8bit; + bus-width = <8>; }; - usb@c5004000 { + usb at c5004000 { diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts 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 d15b149..ebaf62a 100644 --- a/drivers/mmc/host/omap_hsmmc.c diff --git a/a/content_digest b/N1/content_digest index 7da3c79..c8dc27f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,22 +3,10 @@ "ref\04F7553D1.4030008@st.com\0" "ref\0201203301136.05038.arnd@arndb.de\0" "ref\04F75D5C0.5050307@wwwdotorg.org\0" - "From\0Chris Ball <cjb@laptop.org>\0" + "From\0cjb@laptop.org (Chris Ball)\0" "Subject\0[PATCH v2] mmc: dt: Consolidate DT bindings\0" "Date\0Sun, 13 May 2012 00:14:24 -0400\0" - "To\0Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0Stephen Warren <swarren@wwwdotorg.org>" - Viresh Kumar <viresh.kumar@st.com> - patches@linaro.org <patches@linaro.org> - devicetree-discuss@lists.ozlabs.org <devicetree-discuss@lists.ozlabs.org> - linux-mmc@vger.kernel.org <linux-mmc@vger.kernel.org> - rob.herring@calxeda.com <rob.herring@calxeda.com> - Anton Vorontsov <anton.vorontsov@linaro.org> - linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org> - ben-linux@fluff.org <ben-linux@fluff.org> - kgene.kim@samsung.com <kgene.kim@samsung.com> - Lee Jones <lee.jones@linaro.org> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Arnd,\n" @@ -145,7 +133,7 @@ "+\n" "+Example:\n" "+\n" - "+sdhci@ab000000 {\n" + "+sdhci at ab000000 {\n" "+\tcompatible = \"sdhci\";\n" "+\treg = <0xab000000 0x200>;\n" "+\tinterrupts = <23>;\n" @@ -173,7 +161,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" @@ -209,7 +197,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" @@ -218,7 +206,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" @@ -231,7 +219,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" @@ -308,15 +296,15 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@78000200 {\n" + " \tsdhci at 78000200 {\n" "@@ -141,6 +142,7 @@\n" " \n" - " \tsdhci@78000400 {\n" + " \tsdhci at 78000400 {\n" " \t\tsupport-8bit;\n" "+\t\tbus-width = <8>;\n" " \t};\n" " \n" - " \tahub@70080000 {\n" + " \tahub at 70080000 {\n" "diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts\n" "index 6857cec..7cd513a 100644\n" "--- a/arch/arm/boot/dts/tegra-harmony.dts\n" @@ -328,7 +316,7 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000400 {\n" + " \tsdhci at c8000400 {\n" "@@ -335,6 +336,7 @@\n" " \t\twp-gpios = <&gpio 59 0>; /* gpio PH3 */\n" " \t\tpower-gpios = <&gpio 70 0>; /* gpio PI6 */\n" @@ -336,7 +324,7 @@ "+\t\tbus-width = <8>;\n" " \t};\n" " \n" - " \tusb@c5004000 {\n" + " \tusb at c5004000 {\n" "diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts\n" "index 34a9177..8d625e4 100644\n" "--- a/arch/arm/boot/dts/tegra-paz00.dts\n" @@ -348,10 +336,10 @@ "+\t\tbus-width = <4>;\n" " \t};\n" " \n" - " \tsdhci@c8000200 {\n" + " \tsdhci at c8000200 {\n" "@@ -325,6 +326,7 @@\n" " \n" - " \tsdhci@c8000600 {\n" + " \tsdhci at c8000600 {\n" " \t\tsupport-8bit;\n" "+\t\tbus-width = <8>;\n" " \t};\n" @@ -368,12 +356,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 c20d5e9..149ab6d 100644\n" "--- a/arch/arm/boot/dts/tegra-ventana.dts\n" @@ -385,24 +373,24 @@ "+\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@c5004000 {\n" + " \tusb at c5004000 {\n" "diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts\n" "index 7e283c8..fe0d609 100644\n" "--- 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 d15b149..ebaf62a 100644\n" "--- a/drivers/mmc/host/omap_hsmmc.c\n" @@ -465,4 +453,4 @@ "Chris Ball <cjb@laptop.org> <http://printf.net/>\n" One Laptop Per Child -0c28262e9791e5d448f87554aa227ac0c8af04d48cb866dfc0e55a17cda6fb2a +512c3ab4ee429b43496c4f5ebe95a66bf169f91c3ca789bc2f05c4aadf7a11ef
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.