diff for duplicates of <53D8E619.90601@suse.de> diff --git a/a/1.txt b/N1/1.txt index 68e77c1..5c2c636 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,7 @@ s/replaced to/replaced with/ > +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi > @@ -248,7 +248,6 @@ > -> mmc@12200000 { +> mmc at 12200000 { > num-slots = <1>; > - supports-highspeed; > broken-cd; @@ -46,7 +46,7 @@ s/replaced to/replaced with/ > pinctrl-names = "default"; > pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -54,7 +54,7 @@ s/replaced to/replaced with/ > + cap-mmc-highspeed; > }; > -> mmc@12220000 { +> mmc at 12220000 { > num-slots = <1>; > - supports-highspeed; > card-detect-delay = <200>; @@ -64,7 +64,7 @@ s/replaced to/replaced with/ > pinctrl-names = "default"; > pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - wp-gpios = <&gpc2 1 0>; @@ -74,7 +74,7 @@ s/replaced to/replaced with/ > + cap-sd-highspeed; > }; > -> mmc@12230000 { +> mmc at 12230000 { > num-slots = <1>; > - supports-highspeed; > broken-cd; @@ -84,7 +84,7 @@ s/replaced to/replaced with/ > samsung,dw-mshc-ddr-timing = <1 2>; > /* See board-specific dts files for pin setup */ > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - }; @@ -92,7 +92,7 @@ s/replaced to/replaced with/ > + cap-sd-highspeed; > }; > -> spi_1: spi@12d30000 { +> spi_1: spi at 12d30000 { [...] > diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts > index 079fdf9..17d8f53 100644 @@ -100,9 +100,9 @@ s/replaced to/replaced with/ > +++ b/arch/arm/boot/dts/exynos5250-snow.dts > @@ -329,10 +329,8 @@ > */ -> mmc@12230000 { +> mmc at 12230000 { > status = "okay"; -> - slot@0 { +> - slot at 0 { > - pinctrl-names = "default"; > - pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>; > - }; @@ -110,7 +110,7 @@ s/replaced to/replaced with/ > + pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>; > }; > -> i2c@12CD0000 { +> i2c at 12CD0000 { Since you said you are targeting 3.16 still, FYI Doug asked me to do the same change for 3.17 in my Spring series for correctness reasons. So we @@ -137,7 +137,7 @@ conflict resolution. > samsung,dw-mshc-sdr-timing = <2 3>; > samsung,dw-mshc-ddr-timing = <1 2>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -154,7 +154,7 @@ conflict resolution. > samsung,dw-mshc-sdr-timing = <2 3>; > samsung,dw-mshc-ddr-timing = <1 2>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - disable-wp; @@ -172,5 +172,5 @@ Regards, Andreas -- -SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany -GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg +SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany +GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg diff --git a/a/content_digest b/N1/content_digest index f3032a6..3d5a525 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,9 @@ "ref\01406514579-3769-1-git-send-email-jh80.chung@samsung.com\0" "ref\01406514579-3769-3-git-send-email-jh80.chung@samsung.com\0" - "From\0Andreas F\303\244rber <afaerber@suse.de>\0" - "Subject\0Re: [PATCHv7 2/5] ARM: dts: exynos: unuse the slot-node and deprecated the supports-highspeed for dw-mmc\0" + "From\0afaerber@suse.de (Andreas F\303\244rber)\0" + "Subject\0[PATCHv7 2/5] ARM: dts: exynos: unuse the slot-node and deprecated the supports-highspeed for dw-mmc\0" "Date\0Wed, 30 Jul 2014 14:33:29 +0200\0" - "To\0Jaehoon Chung <jh80.chung@samsung.com>" - linux-mmc <linux-mmc@vger.kernel.org> - " kgene.kim@samsung.com\0" - "Cc\0Chris Ball <chris@printf.net>" - Ulf Hansson <ulf.hansson@linaro.org> - tgih.jun@samsung.com - devicetree@vger.kernel.org - heiko@sntech.de - dinguyen@altera.com - Mark Rutland <mark.rutland@arm.com> - linux-samsung-soc@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Am 28.07.2014 04:29, schrieb Jaehoon Chung:\n" @@ -54,7 +43,7 @@ "> +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi\n" "> @@ -248,7 +248,6 @@\n" "> \n" - "> \tmmc@12200000 {\n" + "> \tmmc at 12200000 {\n" "> \t\tnum-slots = <1>;\n" "> -\t\tsupports-highspeed;\n" "> \t\tbroken-cd;\n" @@ -65,7 +54,7 @@ "> \t\tpinctrl-names = \"default\";\n" "> \t\tpinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;\n" "> -\n" - "> -\t\tslot@0 {\n" + "> -\t\tslot at 0 {\n" "> -\t\t\treg = <0>;\n" "> -\t\t\tbus-width = <8>;\n" "> -\t\t};\n" @@ -73,7 +62,7 @@ "> +\t\tcap-mmc-highspeed;\n" "> \t};\n" "> \n" - "> \tmmc@12220000 {\n" + "> \tmmc at 12220000 {\n" "> \t\tnum-slots = <1>;\n" "> -\t\tsupports-highspeed;\n" "> \t\tcard-detect-delay = <200>;\n" @@ -83,7 +72,7 @@ "> \t\tpinctrl-names = \"default\";\n" "> \t\tpinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;\n" "> -\n" - "> -\t\tslot@0 {\n" + "> -\t\tslot at 0 {\n" "> -\t\t\treg = <0>;\n" "> -\t\t\tbus-width = <4>;\n" "> -\t\t\twp-gpios = <&gpc2 1 0>;\n" @@ -93,7 +82,7 @@ "> +\t\tcap-sd-highspeed;\n" "> \t};\n" "> \n" - "> \tmmc@12230000 {\n" + "> \tmmc at 12230000 {\n" "> \t\tnum-slots = <1>;\n" "> -\t\tsupports-highspeed;\n" "> \t\tbroken-cd;\n" @@ -103,7 +92,7 @@ "> \t\tsamsung,dw-mshc-ddr-timing = <1 2>;\n" "> \t\t/* See board-specific dts files for pin setup */\n" "> -\n" - "> -\t\tslot@0 {\n" + "> -\t\tslot at 0 {\n" "> -\t\t\treg = <0>;\n" "> -\t\t\tbus-width = <4>;\n" "> -\t\t};\n" @@ -111,7 +100,7 @@ "> +\t\tcap-sd-highspeed;\n" "> \t};\n" "> \n" - "> \tspi_1: spi@12d30000 {\n" + "> \tspi_1: spi at 12d30000 {\n" "[...]\n" "> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts\n" "> index 079fdf9..17d8f53 100644\n" @@ -119,9 +108,9 @@ "> +++ b/arch/arm/boot/dts/exynos5250-snow.dts\n" "> @@ -329,10 +329,8 @@\n" "> \t */\n" - "> \tmmc@12230000 {\n" + "> \tmmc at 12230000 {\n" "> \t\tstatus = \"okay\";\n" - "> -\t\tslot@0 {\n" + "> -\t\tslot at 0 {\n" "> -\t\t\tpinctrl-names = \"default\";\n" "> -\t\t\tpinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;\n" "> -\t\t};\n" @@ -129,7 +118,7 @@ "> +\t\tpinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;\n" "> \t};\n" "> \n" - "> \ti2c@12CD0000 {\n" + "> \ti2c at 12CD0000 {\n" "\n" "Since you said you are targeting 3.16 still, FYI Doug asked me to do the\n" "same change for 3.17 in my Spring series for correctness reasons. So we\n" @@ -156,7 +145,7 @@ "> \tsamsung,dw-mshc-sdr-timing = <2 3>;\n" "> \tsamsung,dw-mshc-ddr-timing = <1 2>;\n" "> -\n" - "> -\tslot@0 {\n" + "> -\tslot at 0 {\n" "> -\t\treg = <0>;\n" "> -\t\tbus-width = <8>;\n" "> -\t};\n" @@ -173,7 +162,7 @@ "> \tsamsung,dw-mshc-sdr-timing = <2 3>;\n" "> \tsamsung,dw-mshc-ddr-timing = <1 2>;\n" "> -\n" - "> -\tslot@0 {\n" + "> -\tslot at 0 {\n" "> -\t\treg = <0>;\n" "> -\t\tbus-width = <4>;\n" "> -\t\tdisable-wp;\n" @@ -191,7 +180,7 @@ "Andreas\n" "\n" "-- \n" - "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N\303\274rnberg, Germany\n" - "GF: Jeff Hawn, Jennifer Guild, Felix Imend\303\266rffer; HRB 16746 AG N\303\274rnberg" + "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany\n" + GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg -6f16bad922a8da21dc893cd9df7667d9207b5924adf8041480544f62fec8c4a3 +60d432203dc20510fd40532f6211d6d246323a3ca39e36642d66e40ea8a25a4a
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.