From patchwork Fri Jul 25 01:11:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4621021 Return-Path: X-Original-To: patchwork-linux-mmc@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 681CFC0514 for ; Fri, 25 Jul 2014 01:12:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50812201DD for ; Fri, 25 Jul 2014 01:12:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C5AC201EF for ; Fri, 25 Jul 2014 01:12:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758801AbaGYBMH (ORCPT ); Thu, 24 Jul 2014 21:12:07 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:61148 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758781AbaGYBME (ORCPT ); Thu, 24 Jul 2014 21:12:04 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N9800CKNTZVYPB0@mailout1.samsung.com>; Fri, 25 Jul 2014 10:11:55 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.112]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 0F.CA.16580.BDEA1D35; Fri, 25 Jul 2014 10:11:55 +0900 (KST) X-AuditID: cbfee691-b7f2f6d0000040c4-19-53d1aedbf35f Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 5B.00.04943.ADEA1D35; Fri, 25 Jul 2014 10:11:55 +0900 (KST) Received: from localhost.localdomain ([10.252.81.186]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N9800C0OTZUFH50@mmp2.samsung.com>; Fri, 25 Jul 2014 10:11:54 +0900 (KST) From: Jaehoon Chung To: linux-mmc Cc: Chris Ball , Ulf Hansson , tgih.jun@samsung.com, devicetree@vger.kernel.org, heiko@sntech.de, dinguyen@altera.com, Mark Rutland , kgene.kim@samsung.com, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jaehoon Chung Subject: [PATCHv6 1/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Fri, 25 Jul 2014 10:11:49 +0900 Message-id: <1406250713-22604-2-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1406250713-22604-1-git-send-email-jh80.chung@samsung.com> References: <1406250713-22604-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRmVeSWpSXmKPExsWyRsSkQPf2uovBBiu3cFpMuLyd0WL+kXOs FscvLWa2+P/oNavFjV9trBa9C66yWWx6fI3V4sj/fkaLGef3MVksvX6RyeLD/YvMFsfXhjvw eLTuncDmsWbeGkaPO9f2sHlsXlLvcePVQiaPvi2rGD22X5vH7PF5k1wARxSXTUpqTmZZapG+ XQJXxv2fL9kKuhQrrv3YyNjAeFuqi5GTQ0LAROLHse0sELaYxIV769m6GLk4hASWMkq0ffrO BlN0ZF03O0RiOqPEr8cboaramCT27njNClLFJqAjsf3bcSYQW0RAU6Jz+0qwImaBK0wSZ+9s ASsSFsiUmHXiMZjNIqAq0fFlMTuIzSvgJjF5yU+gZg6gdQoScybZgIQ5Bdwl5ny8zQoSFgIq uTtDA2SkhMA5dol/+8+wQYwRkPg2+RALRKusxKYDzBBHS0ocXHGDZQKj8AJGhlWMoqkFyQXF SelFpnrFibnFpXnpesn5uZsYgTFz+t+ziTsY7x+wPsSYDDRuIrOUaHI+MObySuINjc2MLExN TI2NzC3NSBNWEudNf5QUJCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoHxoJhw+u9KkTa5bYnM wfu/PH7zKqo18nrN1gi+DgdmjesaRRZbq4zzd57criTEnss0/4gQ27nbu6Yypn84NF316wq2 ZVoBbetesl/TXcTENtfy2evDibPE6nZd339r7fFHR7LvbMmY4f8uLi17lrzLlOS6BecXPlu7 0rf8XnHt303LXWY93HLisRJLcUaioRZzUXEiAHAeM22vAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFIsWRmVeSWpSXmKPExsVy+t9jQd3b6y4GGxz0sJhweTujxfwj51gt jl9azGzx/9FrVosbv9pYLXoXXGWz2PT4GqvFkf/9jBYzzu9jslh6/SKTxYf7F5ktjq8Nd+Dx aN07gc1jzbw1jB53ru1h89i8pN7jxquFTB59W1Yxemy/No/Z4/MmuQCOqAZGm4zUxJTUIoXU vOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zBygY5UUyhJzSoFCAYnFxUr6 dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGfd/vmQr6FKsuPZjI2MD422pLkZODgkBE4kj67rZ IWwxiQv31rN1MXJxCAlMZ5T49XgjlNPGJLF3x2tWkCo2AR2J7d+OM4HYIgKaEp3bV4IVMQtc YZI4e2cLWJGwQKbErBOPwWwWAVWJji+LwVbwCrhJTF7yE6iZA2idgsScSTYgYU4Bd4k5H2+z goSFgEruztCYwMi7gJFhFaNoakFyQXFSeq6hXnFibnFpXrpecn7uJkZwPD6T2sG4ssHiEKMA B6MSD29H/cVgIdbEsuLK3EOMEhzMSiK8bnOBQrwpiZVVqUX58UWlOanFhxhNgW6ayCwlmpwP TBV5JfGGxiZmRpZG5oYWRsbmSuK8B1qtA4UE0hNLUrNTUwtSi2D6mDg4pRoYmRZMrKvdzH3l +/8tRew2RyKXa6lNKdl1RXqd/lnbdst4TRb/so/zb7y6JReweOeB6ZyHNjhpWizx+mHfaiIo y9zE+mirVWl/SZ7CnX6lLyfWvFEScaqrzFFQuTjZJW/Zsk0v7K892yLO+PRVS6c0w87Zu4su Kf96V73rfcWeSAv5j0de3MxJV2Ipzkg01GIuKk4EAGhsTj7dAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Almost Soc is used the slot per a host. Don't use the slot-node and deprecated the "supports-highsped" property. Instead, use the cap-mmc/sd-highspeed. Signed-off-by: Jaehoon Chung Reviewed-by: Tushar Behera Reviewed-by: Ulf Hansson Tested-by: Sachin Kamat Acked-by: Seungwon Jeon --- .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 17 +++++------------ .../devicetree/bindings/mmc/k3-dw-mshc.txt | 12 +++++------- .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 12 +++++------- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt index 532b1d4..9308325 100644 --- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt @@ -46,13 +46,14 @@ Required Properties: - if CIU clock divider value is 0 (that is divide by 1), both tx and rx phase shift clocks should be 0. -Required properties for a slot: +Required properties for a slot (Deprecated - Recommend to use one slot per a host): * gpios: specifies a list of gpios used for command, clock and data bus. The first gpio is the command line and the second gpio is the clock line. The rest of the gpios (depending on the bus-width property) are the data lines in no particular order. The format of the gpio specifier depends on the gpio controller. + (Deprecated - Refer to Documentaion/devicetree/binding/pinctrl/samsung-pinctrl.txt) Example: @@ -69,21 +70,13 @@ Example: dwmmc0@12200000 { num-slots = <1>; - supports-highspeed; + cap-mmc-highspeed; + cap-sd-highspeed; broken-cd; fifo-depth = <0x80>; 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>; - gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>, - <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>, - <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>, - <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>, - <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>; - }; + bus-width = <8>; }; diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt index e5bc49f..3b35449 100644 --- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt @@ -34,13 +34,11 @@ Example: num-slots = <1>; vmmc-supply = <&ldo12>; fifo-depth = <0x100>; - supports-highspeed; pinctrl-names = "default"; pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>; - slot@0 { - reg = <0>; - bus-width = <4>; - disable-wp; - cd-gpios = <&gpio10 3 0>; - }; + bus-width = <4>; + disable-wp; + cd-gpios = <&gpio10 3 0>; + cap-mmc-highspeed; + cap-sd-highspeed; }; diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt index 2d4a725..346c609 100644 --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt @@ -67,7 +67,8 @@ Optional properties: * card-detect-delay: Delay in milli-seconds before detecting card after card insert event. The default value is 0. -* supports-highspeed: Enables support for high speed cards (up to 50MHz) +* supports-highspeed (DEPRECATED): Enables support for high speed cards (up to 50MHz) + (use "cap-mmc-highspeed" or "cap-sd-highspeed" instead) * broken-cd: as documented in mmc core bindings. @@ -98,14 +99,11 @@ board specific portions as listed below. clock-frequency = <400000000>; clock-freq-min-max = <400000 200000000>; num-slots = <1>; - supports-highspeed; broken-cd; fifo-depth = <0x80>; card-detect-delay = <200>; vmmc-supply = <&buck8>; - - slot@0 { - reg = <0>; - bus-width = <8>; - }; + bus-width = <8>; + cap-mmc-highspeed; + cap-sd-highspeed; };