diff for duplicates of <53F1F027.7060609@samsung.com> diff --git a/a/1.txt b/N1/1.txt index 3660e61..516ca5c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > samsung,dw-mshc-sdr-timing = <2 3>; > samsung,dw-mshc-ddr-timing = <1 2>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -57,7 +57,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-mmc-highspeed; > }; > -> watchdog@10060000 { +> watchdog at 10060000 { > diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts > index e925c9f..de15114 100644 > --- a/arch/arm/boot/dts/exynos4412-origen.dts @@ -73,7 +73,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > samsung,dw-mshc-sdr-timing = <2 3>; > samsung,dw-mshc-ddr-timing = <1 2>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -81,14 +81,14 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-mmc-highspeed; > }; > -> codec@13400000 { +> codec at 13400000 { > diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts > index 11967f4..5e066cd 100644 > --- a/arch/arm/boot/dts/exynos4412-trats2.dts > +++ b/arch/arm/boot/dts/exynos4412-trats2.dts > @@ -520,7 +520,6 @@ > -> mmc@12550000 { +> mmc at 12550000 { > num-slots = <1>; > - supports-highspeed; > broken-cd; @@ -99,7 +99,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > status = "okay"; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -107,13 +107,13 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-mmc-highspeed; > }; > -> serial@13800000 { +> serial at 13800000 { > diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts > index d0de1f5..42a3590 100644 > --- a/arch/arm/boot/dts/exynos5250-arndale.dts > +++ b/arch/arm/boot/dts/exynos5250-arndale.dts > @@ -401,7 +401,6 @@ -> mmc_0: mmc@12200000 { +> mmc_0: mmc at 12200000 { > status = "okay"; > num-slots = <1>; > - supports-highspeed; @@ -125,7 +125,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -133,7 +133,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-mmc-highspeed; > }; > -> mmc_2: mmc@12220000 { +> mmc_2: mmc at 12220000 { > status = "okay"; > num-slots = <1>; > - supports-highspeed; @@ -145,7 +145,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - disable-wp; @@ -155,14 +155,14 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-sd-highspeed; > }; > -> i2s0: i2s@03830000 { +> i2s0: i2s at 03830000 { > diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi > index e603e9c..89034fd 100644 > --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi > +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi > @@ -89,7 +89,6 @@ > -> mmc@12200000 { +> mmc at 12200000 { > num-slots = <1>; > - supports-highspeed; > broken-cd; @@ -173,7 +173,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > 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>; > - }; @@ -181,7 +181,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-mmc-highspeed; > }; > -> mmc@12220000 { +> mmc at 12220000 { > num-slots = <1>; > - supports-highspeed; > card-detect-delay = <200>; @@ -191,7 +191,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > 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>; @@ -201,7 +201,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-sd-highspeed; > }; > -> mmc@12230000 { +> mmc at 12230000 { > num-slots = <1>; > - supports-highspeed; > broken-cd; @@ -211,7 +211,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > 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>; > - }; @@ -219,13 +219,13 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-sd-highspeed; > }; > -> spi_1: spi@12d30000 { +> spi_1: spi at 12d30000 { > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts > index b4b35ad..6a0f4c0 100644 > --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts > +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts > @@ -284,7 +284,6 @@ -> mmc@12200000 { +> mmc at 12200000 { > status = "okay"; > num-slots = <1>; > - supports-highspeed; @@ -237,7 +237,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -245,7 +245,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-mmc-highspeed; > }; > -> mmc@12220000 { +> mmc at 12220000 { > status = "okay"; > num-slots = <1>; > - supports-highspeed; @@ -256,7 +256,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - disable-wp; @@ -266,16 +266,16 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + 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 f2b8c41..eb437f6 100644 > --- a/arch/arm/boot/dts/exynos5250-snow.dts > +++ b/arch/arm/boot/dts/exynos5250-snow.dts > @@ -240,10 +240,8 @@ > */ -> mmc@12230000 { +> mmc at 12230000 { > status = "okay"; -> - slot@0 { +> - slot at 0 { > - pinctrl-names = "default"; > - pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>; > - }; @@ -283,7 +283,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>; > }; > -> i2c@12CD0000 { +> i2c at 12CD0000 { > diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts > index 8c84ab2..a803b60 100644 > --- a/arch/arm/boot/dts/exynos5260-xyref5260.dts @@ -302,7 +302,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd0_rdqs &sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -321,7 +321,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - disable-wp; @@ -345,7 +345,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > samsung,dw-mshc-sdr-timing = <2 3>; > samsung,dw-mshc-ddr-timing = <1 2>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -362,7 +362,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > 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; @@ -377,7 +377,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts > +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts > @@ -50,7 +50,6 @@ -> mmc@12200000 { +> mmc at 12200000 { > status = "okay"; > broken-cd; > - supports-highspeed; @@ -389,7 +389,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; > vmmc-supply = <&ldo10_reg>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -397,7 +397,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-mmc-highspeed; > }; > -> mmc@12220000 { +> mmc at 12220000 { > status = "okay"; > - supports-highspeed; > card-detect-delay = <200>; @@ -408,7 +408,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; > vmmc-supply = <&ldo10_reg>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - }; @@ -416,7 +416,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-sd-highspeed; > }; > -> hsi2c_4: i2c@12CA0000 { +> hsi2c_4: i2c at 12CA0000 { > diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts > index 228a6b1..7b1ed2c 100644 > --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -435,7 +435,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -455,7 +455,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - }; @@ -468,7 +468,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts > +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts > @@ -76,34 +76,26 @@ -> mmc@12200000 { +> mmc at 12200000 { > status = "okay"; > broken-cd; > - supports-highspeed; @@ -479,7 +479,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -487,7 +487,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-mmc-highspeed; > }; > -> mmc@12220000 { +> mmc at 12220000 { > status = "okay"; > - supports-highspeed; > card-detect-delay = <200>; @@ -497,7 +497,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - }; @@ -505,7 +505,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > + cap-sd-highspeed; > }; > -> dp-controller@145B0000 { +> dp-controller at 145B0000 { > diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts > index f3ee48b..a587dd6 100644 > --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -524,7 +524,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <8>; > - }; @@ -544,7 +544,7 @@ On 08/07/2014 04:38 PM, Jaehoon Chung wrote: > pinctrl-names = "default"; > pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; > - -> - slot@0 { +> - slot at 0 { > - reg = <0>; > - bus-width = <4>; > - }; diff --git a/a/content_digest b/N1/content_digest index 0abdd46..0b80391 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,9 @@ "ref\01407397082-32495-1-git-send-email-jh80.chung@samsung.com\0" "ref\01407397082-32495-4-git-send-email-jh80.chung@samsung.com\0" - "From\0Jaehoon Chung <jh80.chung@samsung.com>\0" - "Subject\0Re: [PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc\0" + "From\0jh80.chung@samsung.com (Jaehoon Chung)\0" + "Subject\0[PATCHv10 3/5] ARM: dts: exynos: unuse the slot-node and deprecate the supports-highspeed for dw-mmc\0" "Date\0Mon, 18 Aug 2014 21:23:03 +0900\0" - "To\0Jaehoon Chung <jh80.chung@samsung.com>" - " linux-mmc <linux-mmc@vger.kernel.org>\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> - kgene.kim@samsung.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" "Hi, Kukjin.\n" @@ -68,7 +57,7 @@ "> \t\tsamsung,dw-mshc-sdr-timing = <2 3>;\n" "> \t\tsamsung,dw-mshc-ddr-timing = <1 2>;\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" @@ -76,7 +65,7 @@ "> +\t\tcap-mmc-highspeed;\n" "> \t};\n" "> \n" - "> \twatchdog@10060000 {\n" + "> \twatchdog at 10060000 {\n" "> diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts\n" "> index e925c9f..de15114 100644\n" "> --- a/arch/arm/boot/dts/exynos4412-origen.dts\n" @@ -92,7 +81,7 @@ "> \t\tsamsung,dw-mshc-sdr-timing = <2 3>;\n" "> \t\tsamsung,dw-mshc-ddr-timing = <1 2>;\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" @@ -100,14 +89,14 @@ "> +\t\tcap-mmc-highspeed;\n" "> \t};\n" "> \n" - "> \tcodec@13400000 {\n" + "> \tcodec at 13400000 {\n" "> diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts\n" "> index 11967f4..5e066cd 100644\n" "> --- a/arch/arm/boot/dts/exynos4412-trats2.dts\n" "> +++ b/arch/arm/boot/dts/exynos4412-trats2.dts\n" "> @@ -520,7 +520,6 @@\n" "> \n" - "> \tmmc@12550000 {\n" + "> \tmmc at 12550000 {\n" "> \t\tnum-slots = <1>;\n" "> -\t\tsupports-highspeed;\n" "> \t\tbroken-cd;\n" @@ -118,7 +107,7 @@ "> \t\tpinctrl-names = \"default\";\n" "> \t\tstatus = \"okay\";\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" @@ -126,13 +115,13 @@ "> +\t\tcap-mmc-highspeed;\n" "> \t};\n" "> \n" - "> \tserial@13800000 {\n" + "> \tserial at 13800000 {\n" "> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts\n" "> index d0de1f5..42a3590 100644\n" "> --- a/arch/arm/boot/dts/exynos5250-arndale.dts\n" "> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts\n" "> @@ -401,7 +401,6 @@\n" - "> \tmmc_0: mmc@12200000 {\n" + "> \tmmc_0: mmc at 12200000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tnum-slots = <1>;\n" "> -\t\tsupports-highspeed;\n" @@ -144,7 +133,7 @@ "> \t\tpinctrl-names = \"default\";\n" "> \t\tpinctrl-0 = <&sd0_clk &sd0_cmd &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" @@ -152,7 +141,7 @@ "> +\t\tcap-mmc-highspeed;\n" "> \t};\n" "> \n" - "> \tmmc_2: mmc@12220000 {\n" + "> \tmmc_2: mmc at 12220000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tnum-slots = <1>;\n" "> -\t\tsupports-highspeed;\n" @@ -164,7 +153,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\tdisable-wp;\n" @@ -174,14 +163,14 @@ "> +\t\tcap-sd-highspeed;\n" "> \t};\n" "> \n" - "> \ti2s0: i2s@03830000 {\n" + "> \ti2s0: i2s at 03830000 {\n" "> diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi\n" "> index e603e9c..89034fd 100644\n" "> --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi\n" "> +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi\n" "> @@ -89,7 +89,6 @@\n" "> \n" - "> \tmmc@12200000 {\n" + "> \tmmc at 12200000 {\n" "> \t\tnum-slots = <1>;\n" "> -\t\tsupports-highspeed;\n" "> \t\tbroken-cd;\n" @@ -192,7 +181,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" @@ -200,7 +189,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" @@ -210,7 +199,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" @@ -220,7 +209,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" @@ -230,7 +219,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" @@ -238,13 +227,13 @@ "> +\t\tcap-sd-highspeed;\n" "> \t};\n" "> \n" - "> \tspi_1: spi@12d30000 {\n" + "> \tspi_1: spi at 12d30000 {\n" "> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts\n" "> index b4b35ad..6a0f4c0 100644\n" "> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts\n" "> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts\n" "> @@ -284,7 +284,6 @@\n" - "> \tmmc@12200000 {\n" + "> \tmmc at 12200000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tnum-slots = <1>;\n" "> -\t\tsupports-highspeed;\n" @@ -256,7 +245,7 @@ "> \t\tpinctrl-names = \"default\";\n" "> \t\tpinctrl-0 = <&sd0_clk &sd0_cmd &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" @@ -264,7 +253,7 @@ "> +\t\tcap-mmc-highspeed;\n" "> \t};\n" "> \n" - "> \tmmc@12220000 {\n" + "> \tmmc at 12220000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tnum-slots = <1>;\n" "> -\t\tsupports-highspeed;\n" @@ -275,7 +264,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\tdisable-wp;\n" @@ -285,16 +274,16 @@ "> +\t\tcap-sd-highspeed;\n" "> \t};\n" "> \n" - "> \tspi_1: spi@12d30000 {\n" + "> \tspi_1: spi at 12d30000 {\n" "> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts\n" "> index f2b8c41..eb437f6 100644\n" "> --- a/arch/arm/boot/dts/exynos5250-snow.dts\n" "> +++ b/arch/arm/boot/dts/exynos5250-snow.dts\n" "> @@ -240,10 +240,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" @@ -302,7 +291,7 @@ "> +\t\tpinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;\n" "> \t};\n" "> \n" - "> \ti2c@12CD0000 {\n" + "> \ti2c at 12CD0000 {\n" "> diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts\n" "> index 8c84ab2..a803b60 100644\n" "> --- a/arch/arm/boot/dts/exynos5260-xyref5260.dts\n" @@ -321,7 +310,7 @@ "> \tpinctrl-names = \"default\";\n" "> \tpinctrl-0 = <&sd0_rdqs &sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;\n" "> -\n" - "> -\tslot@0 {\n" + "> -\tslot at 0 {\n" "> -\t\treg = <0>;\n" "> -\t\tbus-width = <8>;\n" "> -\t};\n" @@ -340,7 +329,7 @@ "> \tpinctrl-names = \"default\";\n" "> \tpinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;\n" "> -\n" - "> -\tslot@0 {\n" + "> -\tslot at 0 {\n" "> -\t\treg = <0>;\n" "> -\t\tbus-width = <4>;\n" "> -\t\tdisable-wp;\n" @@ -364,7 +353,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" @@ -381,7 +370,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" @@ -396,7 +385,7 @@ "> --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts\n" "> +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts\n" "> @@ -50,7 +50,6 @@\n" - "> \tmmc@12200000 {\n" + "> \tmmc at 12200000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tbroken-cd;\n" "> -\t\tsupports-highspeed;\n" @@ -408,7 +397,7 @@ "> \t\tpinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;\n" "> \t\tvmmc-supply = <&ldo10_reg>;\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" @@ -416,7 +405,7 @@ "> +\t\tcap-mmc-highspeed;\n" "> \t};\n" "> \n" - "> \tmmc@12220000 {\n" + "> \tmmc at 12220000 {\n" "> \t\tstatus = \"okay\";\n" "> -\t\tsupports-highspeed;\n" "> \t\tcard-detect-delay = <200>;\n" @@ -427,7 +416,7 @@ "> \t\tpinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;\n" "> \t\tvmmc-supply = <&ldo10_reg>;\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" @@ -435,7 +424,7 @@ "> +\t\tcap-sd-highspeed;\n" "> \t};\n" "> \n" - "> \thsi2c_4: i2c@12CA0000 {\n" + "> \thsi2c_4: i2c at 12CA0000 {\n" "> diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts\n" "> index 228a6b1..7b1ed2c 100644\n" "> --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts\n" @@ -454,7 +443,7 @@ "> \tpinctrl-names = \"default\";\n" "> \tpinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;\n" "> -\n" - "> -\tslot@0 {\n" + "> -\tslot at 0 {\n" "> -\t\treg = <0>;\n" "> -\t\tbus-width = <8>;\n" "> -\t};\n" @@ -474,7 +463,7 @@ "> \tpinctrl-names = \"default\";\n" "> \tpinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;\n" "> -\n" - "> -\tslot@0 {\n" + "> -\tslot at 0 {\n" "> -\t\treg = <0>;\n" "> -\t\tbus-width = <4>;\n" "> -\t};\n" @@ -487,7 +476,7 @@ "> --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts\n" "> +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts\n" "> @@ -76,34 +76,26 @@\n" - "> \tmmc@12200000 {\n" + "> \tmmc at 12200000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tbroken-cd;\n" "> -\t\tsupports-highspeed;\n" @@ -498,7 +487,7 @@ "> \t\tpinctrl-names = \"default\";\n" "> \t\tpinctrl-0 = <&sd0_clk &sd0_cmd &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" @@ -506,7 +495,7 @@ "> +\t\tcap-mmc-highspeed;\n" "> \t};\n" "> \n" - "> \tmmc@12220000 {\n" + "> \tmmc at 12220000 {\n" "> \t\tstatus = \"okay\";\n" "> -\t\tsupports-highspeed;\n" "> \t\tcard-detect-delay = <200>;\n" @@ -516,7 +505,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};\n" @@ -524,7 +513,7 @@ "> +\t\tcap-sd-highspeed;\n" "> \t};\n" "> \n" - "> \tdp-controller@145B0000 {\n" + "> \tdp-controller at 145B0000 {\n" "> diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts\n" "> index f3ee48b..a587dd6 100644\n" "> --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts\n" @@ -543,7 +532,7 @@ "> \tpinctrl-names = \"default\";\n" "> \tpinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;\n" "> -\n" - "> -\tslot@0 {\n" + "> -\tslot at 0 {\n" "> -\t\treg = <0>;\n" "> -\t\tbus-width = <8>;\n" "> -\t};\n" @@ -563,7 +552,7 @@ "> \tpinctrl-names = \"default\";\n" "> \tpinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;\n" "> -\n" - "> -\tslot@0 {\n" + "> -\tslot at 0 {\n" "> -\t\treg = <0>;\n" "> -\t\tbus-width = <4>;\n" "> -\t};\n" @@ -573,4 +562,4 @@ "> \n" > -981e68bfec5292432c42cdcf6d774f6b13af9393c10162e028382325ff40c7e2 +563a53a1ac2806cd9568c6c71199240fdaf31c8ac2e3120720e4709a25b79cb9
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.