From patchwork Wed Jul 30 11:05:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4646941 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 274579F529 for ; Wed, 30 Jul 2014 11:05:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2994A20122 for ; Wed, 30 Jul 2014 11:05:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 134A220145 for ; Wed, 30 Jul 2014 11:05:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752609AbaG3LFa (ORCPT ); Wed, 30 Jul 2014 07:05:30 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:16030 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751223AbaG3LFN (ORCPT ); Wed, 30 Jul 2014 07:05:13 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N9I0080NUSN8H80@mailout4.samsung.com>; Wed, 30 Jul 2014 20:05:11 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.112]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 18.3D.15745.761D8D35; Wed, 30 Jul 2014 20:05:11 +0900 (KST) X-AuditID: cbfee691-b7f306d000003d81-a7-53d8d1674d73 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 6C.78.04943.761D8D35; Wed, 30 Jul 2014 20:05:11 +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 <0N9I00KXXUSMND20@mmp1.samsung.com>; Wed, 30 Jul 2014 20:05:10 +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, Doug Anderson , cpgs@samsung.com, Jaehoon Chung Subject: [PATCHv8 1/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Wed, 30 Jul 2014 20:05:06 +0900 Message-id: <1406718310-32078-2-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1406718310-32078-1-git-send-email-jh80.chung@samsung.com> References: <1406718310-32078-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJIsWRmVeSWpSXmKPExsWyRsSkQDf94o1gg4lvBC0mXN7OaPHykKbF /CPnWC0WbF/JZHH80mJmi/+PXrNa3PjVxmrRu+Aqm8Wmx9dYLY7872e0mHF+H5PF0usXmSw+ 3L/IbHF8bbgDn0fr3glsHmvmrWH0WLCp1OPOtT1sHpuX1HvceLWQyaNvyypGj+3X5jF7fN4k F8AZxWWTkpqTWZZapG+XwJWx+Okj1oJPihUfji9lbWDcKt3FyMkhIWAicW/6JVYIW0ziwr31 bF2MXBxCAksZJc6u2AaU4AArOri8GiK+iFFiw7G1UEVtTBKzV/xgA+lmE9CR2P7tOBOILSKg KdG5fSVYEbNAL7PE8x0PWEASwgKZEs2tC8BsFgFViTufXrGD2LwCbhIbL75hgtimIDFnkg1I mFPAHSh8Huw6IaCSmY2HWUBmSgi8ZJd48u0mK8QcAYlvkw+xQPTKSmw6wAzxjaTEwRU3WCYw Ci9gZFjFKJpakFxQnJReZKpXnJhbXJqXrpecn7uJERhNp/89m7iD8f4B60OMyUDjJjJLiSbn A6MxryTe0NjMyMLUxNTYyNzSjDRhJXHe9EdJQUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoY RZNijn4PbHOMeBbRZ9Su/DG/vkLy+0qur6t/393wbY9y1N6JaoEX5SKYgzZdEZiafeH2xYVL HAzcltm6r8i4+SpVcE2yas7LC44cMfwMTMXir068d3twOHzWRPdpKyee42xvMZv5U2cHx09Z jxMCZbJiz75emrcv/GNlb6zb/Lx3SS9lf5w+rsRSnJFoqMVcVJwIAMT+wlO8AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsVy+t9jAd30izeCDQ63cVhMuLyd0eLlIU2L +UfOsVos2L6SyeL4pcXMFv8fvWa1uPGrjdWid8FVNotNj6+xWhz5389oMeP8PiaLpdcvMll8 uH+R2eL42nAHPo/WvRPYPNbMW8PosWBTqceda3vYPDYvqfe48Wohk0ffllWMHtuvzWP2+LxJ LoAzqoHRJiM1MSW1SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwfo dCWFssScUqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYQ1jxuKnj1gLPilWfDi+lLWB cat0FyMHh4SAicTB5dVdjJxAppjEhXvr2boYuTiEBBYxSmw4thbKaWOSmL3iBxtIFZuAjsT2 b8eZQGwRAU2Jzu0rwYqYBXqZJZ7veMACkhAWyJRobl0AZrMIqErc+fSKHcTmFXCT2HjxDRPE ZgWJOZNsQMKcAu5A4fOsILYQUMnMxsMsExh5FzAyrGIUTS1ILihOSs811CtOzC0uzUvXS87P 3cQIjtVnUjsYVzZYHGIU4GBU4uGd8f96sBBrYllxZe4hRgkOZiUR3r61N4KFeFMSK6tSi/Lj i0pzUosPMZoCHTWRWUo0OR+YRvJK4g2NTcyMLI3MDS2MjM2VxHkPtFoHCgmkJ5akZqemFqQW wfQxcXBKNTAuYElknNseLn80Wcie8X2rvlvIr28bN27/5r/A2Nx/5/rKi2Ub1v5+7FxRO3fp 2u9bMv+7r1pz9Y9Ydd5/ZeurVT2ya+7eivj1eonI05lXTvsUCl7Z8L7a+MTFP80vJr5YpMhk kjZlxpNnTeWXxDd7PxD/pW3432TZUtPppT4BV7eZ/mxQfpC0UYmlOCPRUIu5qDgRAGnbOmXr AgAA 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=-7.6 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 SoCs use one slot per host controller. (Even if controller can support the multiple slot, Recommend to use one slot per host controller.) Don't use the slot-node and deprecate the "supports-highspeed" 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 Reviewed-by: Doug Anderson --- .../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..6cd3525 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 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 Documentation/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; };