From patchwork Thu Jul 10 13:10:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 4523761 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9BB5EBEEAA for ; Thu, 10 Jul 2014 13:13:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2126820340 for ; Thu, 10 Jul 2014 13:13:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51F2920272 for ; Thu, 10 Jul 2014 13:13:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X5E7L-00086H-Sz; Thu, 10 Jul 2014 13:10:31 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X5E7H-0007Wz-US for linux-arm-kernel@lists.infradead.org; Thu, 10 Jul 2014 13:10:29 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8H00KWYZ8Q4B90@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 10 Jul 2014 22:10:03 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 77.54.19452.AA09EB35; Thu, 10 Jul 2014 22:10:02 +0900 (KST) X-AuditID: cbfee68e-b7fb96d000004bfc-bc-53be90aa6665 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id FA.8B.05196.AA09EB35; Thu, 10 Jul 2014 22:10:02 +0900 (KST) Received: from DOKGENEKIM03 ([12.36.165.190]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N8H002QOZ8Q2430@mmp2.samsung.com>; Thu, 10 Jul 2014 22:10:02 +0900 (KST) From: Kukjin Kim To: 'Ulf Hansson' , 'Seungwon Jeon' , 'Jaehoon Chung' References: <1404976119-10777-1-git-send-email-jh80.chung@samsung.com> <1404976119-10777-6-git-send-email-jh80.chung@samsung.com> <53BE5F9F.6070809@samsung.com> <002101cf9c35$8da5b240$a8f116c0$%jun@samsung.com> In-reply-to: Subject: RE: [PATCHv3 5/5] mmc: dw_mmc: replace "disable-wp" from slot's quirk to host's quirk Date: Thu, 10 Jul 2014 22:10:00 +0900 Message-id: <021601cf9c40$42da0c60$c88e2520$@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Content-language: ko Thread-index: AQIGzTMbxwJ2lo+T/S2ZGgMlWRKaHQIGfnBhAOEGO/gCLTcxMwJj/h+sAehRoD8BCY9Qv5rXjhjQ X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgleLIzCtJLcpLzFFi42I5/e+Zge6qCfuCDZ7ftbSYcHk7o8X8I+dY LY5fWsxs8f/Ra1aLG7/aWC02Pb7GanHkfz+jxYzz+5gsll6/yGTx4f5FZovja8MduD1a905g 81gzbw2jx51re9g8Ni+p97jxaiGTR9+WVYwe26/NY/b4vEkugCOKyyYlNSezLLVI3y6BK2Pa nC6mgqZmxor/s7ezNzD+SO9i5OSQEDCReHN2CxOELSZx4d56ti5GLg4hgWWMElt+fmWGKXr1 dQVUYjqjxL/f/UwQzl9GiU2TN4O1swloSBx+/4wdJCEi0MAocXPHRGYQh1ngIJPE18+trBAt a5klvvedBmvhFAiWONV3A2yJsECCxPEvS8FsFgFViXk/roHZvAKWEv+2TmGHsAUlfky+xwJi MwuoS0yat4gZwpaX2LzmLdSxChI7zr5mhIiLSOx78Q7MFhGIkXh5uBfsCQmBuRwSO2ZcZodY JiDxbfIhoKEcQAlZiU0HoOZIShxccYNlAqPELCSrZyFZPQvJ6llI1i1gZFnFKJpakFxQnJRe ZKRXnJhbXJqXrpecn7uJEZIK+nYw3jxgfYgxGWj9RGYp0eR8YCrJK4k3NDYzsjA1MTU2Mrc0 I01YSZx30cOkICGB9MSS1OzU1ILUovii0pzU4kOMTBycUg2MzlO2ppRy7jE/WvIuKvz4UcY1 RwoK/qzaae6aERTn6tQfKOyeuerFRm3/7otbIvQ22Lr02pw6dLVyj7jCAwkVl71RouqfHjdc VHMUW/BrV6aV5/dLm98E1IaoWgkrHNN1cJFcv9Lh39c9DlNPPX1fanlv2ymVbJG3fAcDA3ye HBIqTOUQ/TpdiaU4I9FQi7moOBEA5i+d3BsDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOKsWRmVeSWpSXmKPExsVy+t9jQd1VE/YFG2x7YGQx4fJ2Rov5R86x Why/tJjZ4v+j16wWN361sVpsenyN1eLI/35Gixnn9zFZLL1+kcniw/2LzBbH14Y7cHu07p3A 5rFm3hpGjzvX9rB5bF5S73Hj1UImj74tqxg9tl+bx+zxeZNcAEdUA6NNRmpiSmqRQmpecn5K Zl66rZJ3cLxzvKmZgaGuoaWFuZJCXmJuqq2Si0+ArltmDtChSgpliTmlQKGAxOJiJX07TBNC Q9x0LWAaI3R9Q4LgeowM0EDCOsaMaXO6mAqamhkr/s/ezt7A+CO9i5GTQ0LAROLV1xVsELaY xIV764FsLg4hgemMEv9+9zNBOH8ZJTZN3swEUsUmoCFx+P0zdpCEiEADo8TNHROZQRxmgYNM El8/t7JCtKxllvjedxqshVMgWOJU3w1mEFtYIEHi+JelYDaLgKrEvB/XwGxeAUuJf1unsEPY ghI/Jt9jAbGZBdQlJs1bxAxhy0tsXvOWGeJYBYkdZ18zQsRFJPa9eAdmiwjESLw83Ms2gVFo FpJRs5CMmoVk1Cwk7QsYWVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn525iBCeaZ9I7GFc1WBxi FOBgVOLhbejZGyzEmlhWXJl7iFGCg1lJhDerbl+wEG9KYmVValF+fFFpTmrxIUZToE8nMkuJ JucDk2BeSbyhsYmZkaWRmYWRibm5kjjvwVbrQCGB9MSS1OzU1ILUIpg+Jg5OqQZG3dvl9YKx qjtetXmGXDI21TzP4z6RpfaS2kKBkuI3z4OXr+BKSn11c79ttd+jDylX5uaLylvkH9n7fqo8 82PXOy6bY0pa5IxXW662m+MgV7VyanrVusW/3u29l2nlcq5mv1HaiXU3e2M/K/V8mRd92aPr 4Hkf2dWlG3jOP5ouznLwWsXik8u2K7EUZyQaajEXFScCAEO243dKAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140710_061028_342015_CBB12C02 X-CRM114-Status: GOOD ( 23.74 ) X-Spam-Score: -5.7 (-----) Cc: 'Mark Rutland' , devicetree@vger.kernel.org, 'linux-samsung-soc' , =?UTF-8?Q?'Heiko_St=C3=BCbner'?= , 'linux-mmc' , 'Chris Ball' , linux-arm-kernel@lists.infradead.org, dinguyen@altera.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Ulf Hansson wrote: > > On 10 July 2014 13:53, Seungwon Jeon wrote: > > On Thu, July 10, 2014, Ulf Hansson wrote: > >> On 10 July 2014 11:40, Jaehoon Chung wrote: > >> > Hi, Ulf. > >> > > >> > On 07/10/2014 06:15 PM, Ulf Hansson wrote: > >> >> On 10 July 2014 09:08, Jaehoon Chung wrote: > >> >>> Replaced the "disable-wp" into host's quirks. > >> >>> (Because the slot-node is removed at dt-file.) > >> >>> > >> >>> Signed-off-by: Jaehoon Chung > >> >> > >> >> Hi Jaehoon, > >> >> > >> >> I plan to carry these patches through my mmc tree and I will share > >> >> them through a PR from an immutable branch with the ARM SoC guys. > >> >> Please tell me if you have any concern with this set up. > >> > >> Hmm, I having a second thought around this. Could I just apply the mmc > >> patches for my next branch instead of involving ARM SoC? In other > >> words, are there any decencies? If not, I might just apply patch 1 and > >> 5. > >> > > > > [PATCHv4 2/5] ARM: dts: exynos: unuse the slot-node and deprecated the supports-highspeed for dw-mmc > > [PATCHv4 4/5] ARM: dts: rockchip: unuse the slot-node and deprecated the supports-highspeed for dw- > mmc > > [PATCHv4 5/5] mmc: dw_mmc: replace "disable-wp" from slot's quirk to host's quirk > > > > 2nd and 4th are closely related 5th. > > I think it shall be picked together. How about taking whole patch? > > And I hope that it is applied for 3.16-rcX fix. > > (Also, 3rd patch is close to fix patch.) > > > > Kukjin, > > Is it fine to be taken in Ulf's? > > I tried applied the complete patchset for 3.16 rc4, but some of the > DTS patches fails. What are these patches based upon? > > I wonder if it's not best to leave all these for Kukjin to handle > instead. You have my ack for all of the mmc patches! > Hi, Ulf For exynos DT: Acked-by: Kukjin Kim And you may take following change on top of v3.16-rc4 cleanly. BTW it should be merged into 3.16 so that I could avoid useless merge conflicts for 3.17. Note that this patch doesn't make any conflicts with my for-next for 3.17. Thanks, Kukjin ---------------- From: Jaehoon Chung Subject: [PATCHv4 2/5] ARM: dts: remove the slot-node and deprecated the supports-highspeed for dw-mmc for exynos dw-mmc controller can support multiple slots. But, there are no use-cases anywhere. So we don't need to support the slot-node for dw-mmc controller. And "supports-highspeed" property in dw-mmc is deprecated. "supports-highspeed" property can be replaced to "cap-sd/mmc-highspeed". Signed-off-by: Jaehoon Chung Reviewed-by: Tushar Behera Reviewed-by: Ulf Hansson Tested-by: Sachin Kamat Acked-by: Kukjin Kim --- arch/arm/boot/dts/exynos4412-odroidx.dts | 8 ++------ arch/arm/boot/dts/exynos4412-origen.dts | 8 ++------ arch/arm/boot/dts/exynos4412-trats2.dts | 8 ++------ arch/arm/boot/dts/exynos5250-arndale.dts | 18 +++++------------ arch/arm/boot/dts/exynos5250-cros-common.dtsi | 26 +++++++------------------ arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +++++------------ arch/arm/boot/dts/exynos5250-snow.dts | 6 ++---- arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 +++++------------ arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 +++++------------ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 ++++----------- arch/arm/boot/dts/exynos5420-peach-pit.dts | 16 ++++----------- arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 ++++----------- arch/arm/boot/dts/exynos5800-peach-pi.dts | 16 ++++----------- 13 files changed, 51 insertions(+), 141 deletions(-) diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts index 31db28a..778aec6 100644 --- a/arch/arm/boot/dts/exynos4412-odroidx.dts +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts @@ -45,17 +45,13 @@ status = "okay"; num-slots = <1>; - supports-highspeed; broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-ddr-timing = <1 2>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; + cap-mmc-highspeed; }; regulator_p3v3 { 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 +++ b/arch/arm/boot/dts/exynos4412-origen.dts @@ -137,17 +137,13 @@ status = "okay"; num-slots = <1>; - supports-highspeed; broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-ddr-timing = <1 2>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; + cap-mmc-highspeed; }; codec@13400000 { diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index 7787844..65ab885 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -520,7 +520,6 @@ mmc@12550000 { num-slots = <1>; - supports-highspeed; broken-cd; non-removable; card-detect-delay = <200>; @@ -532,11 +531,8 @@ pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>; pinctrl-names = "default"; status = "okay"; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; + cap-mmc-highspeed; }; serial@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 { status = "okay"; num-slots = <1>; - supports-highspeed; broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; @@ -410,17 +409,13 @@ vmmc-supply = <&mmc_reg>; pinctrl-names = "default"; pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; + cap-mmc-highspeed; }; mmc_2: mmc@12220000 { status = "okay"; num-slots = <1>; - supports-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; @@ -428,12 +423,9 @@ vmmc-supply = <&mmc_reg>; pinctrl-names = "default"; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; - - slot@0 { - reg = <0>; - bus-width = <4>; - disable-wp; - }; + bus-width = <4>; + disable-wp; + cap-sd-highspeed; }; i2s0: i2s@03830000 { diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi index 89ac90f..af51361 100644 --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi @@ -248,7 +248,6 @@ mmc@12200000 { num-slots = <1>; - supports-highspeed; broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; @@ -256,44 +255,33 @@ samsung,dw-mshc-ddr-timing = <1 2>; pinctrl-names = "default"; pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; + cap-mmc-highspeed; }; mmc@12220000 { num-slots = <1>; - supports-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-ddr-timing = <1 2>; pinctrl-names = "default"; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; - - slot@0 { - reg = <0>; - bus-width = <4>; - wp-gpios = <&gpc2 1 0>; - }; + bus-width = <4>; + wp-gpios = <&gpc2 1 0>; + cap-sd-highspeed; }; mmc@12230000 { num-slots = <1>; - supports-highspeed; broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-ddr-timing = <1 2>; /* See board-specific dts files for pin setup */ - - slot@0 { - reg = <0>; - bus-width = <4>; - }; + bus-width = <4>; + cap-sd-highspeed; }; spi_1: spi@12d30000 { diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index a794a70..e00ffc6 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -282,7 +282,6 @@ mmc@12200000 { status = "okay"; num-slots = <1>; - supports-highspeed; broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; @@ -290,29 +289,22 @@ samsung,dw-mshc-ddr-timing = <1 2>; pinctrl-names = "default"; pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; + cap-mmc-highspeed; }; mmc@12220000 { status = "okay"; num-slots = <1>; - supports-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-ddr-timing = <1 2>; pinctrl-names = "default"; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; - - slot@0 { - reg = <0>; - bus-width = <4>; - disable-wp; - }; + bus-width = <4>; + disable-wp; + cap-sd-highspeed; }; spi_1: spi@12d30000 { diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index c682c88..851bf06 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -240,10 +240,8 @@ */ mmc@12230000 { status = "okay"; - slot@0 { - pinctrl-names = "default"; - pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>; - }; + pinctrl-names = "default"; + pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>; }; i2c@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 +++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts @@ -69,7 +69,7 @@ num-slots = <1>; broken-cd; bypass-smu; - supports-highspeed; + cap-mmc-highspeed; supports-hs200-mode; /* 200 Mhz */ card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; @@ -77,27 +77,19 @@ samsung,dw-mshc-ddr-timing = <0 2>; pinctrl-names = "default"; pinctrl-0 = <&sd0_rdqs &sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; }; &mmc_2 { status = "okay"; num-slots = <1>; - supports-highspeed; + cap-sd-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-ddr-timing = <1 2>; pinctrl-names = "default"; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>; - - slot@0 { - reg = <0>; - bus-width = <4>; - disable-wp; - }; + bus-width = <4>; + disable-wp; }; diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts index 7275bbd..be3e025 100644 --- a/arch/arm/boot/dts/exynos5410-smdk5410.dts +++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts @@ -40,33 +40,25 @@ &mmc_0 { status = "okay"; num-slots = <1>; - supports-highspeed; + cap-mmc-highspeed; broken-cd; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-ddr-timing = <1 2>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; }; &mmc_2 { status = "okay"; num-slots = <1>; - supports-highspeed; + cap-sd-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-ddr-timing = <1 2>; - - slot@0 { - reg = <0>; - bus-width = <4>; - disable-wp; - }; + bus-width = <4>; + disable-wp; }; &uart0 { diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts index 434fd9d..29dd71b 100644 --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts @@ -50,7 +50,6 @@ mmc@12200000 { status = "okay"; broken-cd; - supports-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <0 4>; @@ -58,16 +57,12 @@ pinctrl-names = "default"; pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; vmmc-supply = <&ldo10_reg>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; + cap-mmc-highspeed; }; mmc@12220000 { status = "okay"; - supports-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; @@ -75,11 +70,8 @@ pinctrl-names = "default"; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; vmmc-supply = <&ldo10_reg>; - - slot@0 { - reg = <0>; - bus-width = <4>; - }; + bus-width = <4>; + cap-mmc-highspeed; }; hsi2c_4: i2c@12CA0000 { diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 6c7cab0..dcbf429 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -175,7 +175,7 @@ num-slots = <1>; broken-cd; caps2-mmc-hs200-1_8v; - supports-highspeed; + cap-mmc-highspeed; non-removable; card-detect-delay = <200>; clock-frequency = <400000000>; @@ -184,17 +184,13 @@ samsung,dw-mshc-ddr-timing = <0 2>; pinctrl-names = "default"; pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; }; &mmc_2 { status = "okay"; num-slots = <1>; - supports-highspeed; + cap-sd-highspeed; card-detect-delay = <200>; clock-frequency = <400000000>; samsung,dw-mshc-ciu-div = <3>; @@ -202,11 +198,7 @@ samsung,dw-mshc-ddr-timing = <1 2>; pinctrl-names = "default"; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; - - slot@0 { - reg = <0>; - bus-width = <4>; - }; + bus-width = <4>; }; &hsi2c_7 { diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts index 6052aa9..8be3d7b 100644 --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts @@ -76,34 +76,26 @@ mmc@12200000 { status = "okay"; broken-cd; - supports-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <0 4>; samsung,dw-mshc-ddr-timing = <0 2>; pinctrl-names = "default"; pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; + cap-mmc-highspeed; }; mmc@12220000 { status = "okay"; - supports-highspeed; card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-ddr-timing = <1 2>; pinctrl-names = "default"; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; - - slot@0 { - reg = <0>; - bus-width = <4>; - }; + bus-width = <4>; + cap-sd-highspeed; }; dp-controller@145B0000 { diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index 28f2a25..f73a385 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -173,7 +173,7 @@ num-slots = <1>; broken-cd; caps2-mmc-hs200-1_8v; - supports-highspeed; + cap-mmc-highspeed; non-removable; card-detect-delay = <200>; clock-frequency = <400000000>; @@ -182,17 +182,13 @@ samsung,dw-mshc-ddr-timing = <0 2>; pinctrl-names = "default"; pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; }; &mmc_2 { status = "okay"; num-slots = <1>; - supports-highspeed; + cap-sd-highspeed; card-detect-delay = <200>; clock-frequency = <400000000>; samsung,dw-mshc-ciu-div = <3>; @@ -200,11 +196,7 @@ samsung,dw-mshc-ddr-timing = <1 2>; pinctrl-names = "default"; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; - - slot@0 { - reg = <0>; - bus-width = <4>; - }; + bus-width = <4>; }; &dp {