From patchwork Mon Jun 30 07:22:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4445991 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 636329F358 for ; Mon, 30 Jun 2014 07:22:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F9BF202F8 for ; Mon, 30 Jun 2014 07:22:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22939202F0 for ; Mon, 30 Jun 2014 07:22:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754173AbaF3HWm (ORCPT ); Mon, 30 Jun 2014 03:22:42 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:29509 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752262AbaF3HWj (ORCPT ); Mon, 30 Jun 2014 03:22:39 -0400 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 <0N7Z0007S0HPX740@mailout4.samsung.com>; Mon, 30 Jun 2014 16:22:37 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.113]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 51.FF.19452.C3011B35; Mon, 30 Jun 2014 16:22:37 +0900 (KST) X-AuditID: cbfee68e-b7fb96d000004bfc-84-53b1103caa85 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 4F.6B.04943.C3011B35; Mon, 30 Jun 2014 16:22:36 +0900 (KST) Received: from localhost.localdomain ([10.252.81.186]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N7Z00MPG0HOWVC0@mmp1.samsung.com>; Mon, 30 Jun 2014 16:22:36 +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: [PATCH 1/4] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Mon, 30 Jun 2014 16:22:28 +0900 Message-id: <1404112951-29467-2-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1404112951-29467-1-git-send-email-jh80.chung@samsung.com> References: <1404112951-29467-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWyRsSkUNdWYGOwQfM9JosJl7czWsw/co7V 4vilxcwW/x+9ZrW48auN1aJ3wVU2i02Pr7FaHPnfz2gx4/w+Joul1y8yWXy4f5HZ4vjacAce j9a9E9g81sxbw+hx59oeNo/NS+o9brxayOTRt2UVo8f2a/OYPT5vkgvgiOKySUnNySxLLdK3 S+DKeNi+mLlgmULFxWv/2RoYG6W6GDk4JARMJI4/Se9i5AQyxSQu3FvPBmILCSxllGidGAkR N5HYuPw2YxcjF1B8EaPEvR8HWSGcNiaJM98vMINUsQnoSGz/dpwJxBYR0JTo3L6SDaSIWeAK k8TZO1tYQRLCAukSvU9ugtksAqoSrZeXMYNcwSvgJrH9sybEQQoScybZgFRwCrhLfH12lRni IDeJpf8mg+2VELjELvF6bw8bxBgBiW+TD7FA9MpKbDrADHG0pMTBFTdYJjAKL2BkWMUomlqQ XFCclF5kpFecmFtcmpeul5yfu4kRGC+n/z3r28F484D1IcZkoHETmaVEk/OB8ZZXEm9obGZk YWpiamxkbmlGmrCSOO+ih0lBQgLpiSWp2ampBalF8UWlOanFhxiZODilGhhr7zS7bk2Vsju+ TKLz8u+p03ZvWi1hfJ3x450tS+beqZT5vvZ3pDLPkyIFAX/Hx/9smVe8O36AWeh8z8Ot/3qN ag7+8a+Reyt09lXB7qx/lxxvurzueMvIkLhrUXZLXmrKlX1z3+6PWWL041n53JvPJJb5/Xm6 +qrKu+XpRQdOn7t/x8Vf7IPvHyWW4oxEQy3mouJEAPi1P8CtAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t9jAV0bgY3BBtefm1lMuLyd0WL+kXOs FscvLWa2+P/oNavFjV9trBa9C66yWWx6fI3V4sj/fkaLGef3MVksvX6RyeLD/YvMFsfXhjvw eLTuncDmsWbeGkaPO9f2sHlsXlLvcePVQiaPvi2rGD22X5vH7PF5k1wAR1QDo01GamJKapFC al5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0LVKCmWJOaVAoYDE4mIl fTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoyH7YuZC5YpVFy89p+tgbFRqouRk0NCwERi4/Lb jBC2mMSFe+vZuhi5OIQEFjFK3PtxkBXCaWOSOPP9AjNIFZuAjsT2b8eZQGwRAU2Jzu0rwTqY Ba4wSZy9s4UVJCEskC7R++QmmM0ioCrRenkZUDMHB6+Am8T2z5ogpoSAgsScSTYgFZwC7hJf n10FGy8EVLH032TWCYy8CxgZVjGKphYkFxQnpeca6hUn5haX5qXrJefnbmIER+QzqR2MKxss DjEKcDAq8fBqLNsQLMSaWFZcmXuIUYKDWUmEV6gOKMSbklhZlVqUH19UmpNafIjRFOimicxS osn5wGSRVxJvaGxiZmRpZG5oYWRsriTOe6DVOlBIID2xJDU7NbUgtQimj4mDU6qBcdKqG8pp WyQmSu+ctip0S8o62z3VEb0VdoZvDZ5Ezvt5bfIjy3qZIinnj7LZ/+LfaCrqOu/YPcOrjLc2 4FBiLf/ykNs8drOMPyipHSh7FcEYI3DxqsTm9PTKb7Enzbfy1F2t+brVpICfS++x8Zssm829 sROnvVTVKnwaEvU8KOGU0XzmJ+ZzlViKMxINtZiLihMB1qc6rd4CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 --- .../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; };