From patchwork Thu Jul 31 05:35:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4653451 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 5A3E6C0338 for ; Thu, 31 Jul 2014 05:35:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 550D82012B for ; Thu, 31 Jul 2014 05:35:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49DB920158 for ; Thu, 31 Jul 2014 05:35:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752631AbaGaFf1 (ORCPT ); Thu, 31 Jul 2014 01:35:27 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:44136 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879AbaGaFfN (ORCPT ); Thu, 31 Jul 2014 01:35:13 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N9K007GBA6LKOA0@mailout4.samsung.com>; Thu, 31 Jul 2014 14:35:09 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.114]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id D7.5A.13863.D85D9D35; Thu, 31 Jul 2014 14:35:09 +0900 (KST) X-AuditID: cbfee690-b7f526d000003627-c7-53d9d58dcb87 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 16.8D.05196.C85D9D35; Thu, 31 Jul 2014 14:35:09 +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 <0N9K000QWA6KS901@mmp1.samsung.com>; Thu, 31 Jul 2014 14:35:08 +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 , =?UTF-8?q?Andreas=20F=E4rber?= , cpgs , Jaehoon Chung Subject: [PATCHv9 2/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Thu, 31 Jul 2014 14:35:04 +0900 Message-id: <1406784907-26349-3-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1406784907-26349-1-git-send-email-jh80.chung@samsung.com> References: <1406784907-26349-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsWyRsSkSLf36s1gg4kX+C2aNxVbTLi8ndHi 5SFNi/lHzrFaLNi+ksni+KXFzBb/H71mtbjxq43VonfBVTaLTY+vsVoc+d/PaDHj/D4mi6XX LzJZfLh/kdni+NpwB36P1r0T2DzWzFvD6LFgU6nHnWt72Dw2L6n3uPFqIZNH35ZVjB7br81j 9th8utrj8ya5AK4oLpuU1JzMstQifbsEroyJ/3ayFqxSqji05i9TA+Nz6S5GTg4JAROJKcd/ MUPYYhIX7q1n62Lk4hASWMoo0bruECtMUceZRVCJRYwSGx/dY4Rw2pgkXq0+zARSxSagI7H9 23EwW0RAU6Jz+0qwDmaBk8wS93+0soEkhAUyJc5+7wYq4uBgEVCVmPgkCiTMK+Am0br3JVhY QkBBYs4kG5Awp4C7xJu1PYwgthBQye/2dnaQkRICH9kl9rW1g+1iERCQ+Db5EAtEr6zEpgNQ 30hKHFxxg2UCo/ACRoZVjKKpBckFxUnpRSZ6xYm5xaV56XrJ+bmbGIHRdfrfswk7GO8dsD7E mAw0biKzlGhyPjA680riDY3NjCxMTUyNjcwtzUgTVhLnVXuUFCQkkJ5YkpqdmlqQWhRfVJqT WnyIkYmDU6qBUVxF7/OXQ2wSqWLdRx232nB/c8+typsq28Gywzdcmv9j/fLzQoUabwU1xLVf 8hjIqZ897/dp97SwSWu+5KTJXZWYesY8Vs06sOufRsB+8WlXP7HPYREu3Z/178mbTR+Y/jxU uKfLsu7I+SXf7ln2BchMiC487y/Ld/mxe/rEk+9nhqZ8LLo6SYmlOCPRUIu5qDgRAAY2cEHE AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrAIsWRmVeSWpSXmKPExsVy+t9jAd3eqzeDDdYeZrNo3lRsMeHydkaL l4c0LeYfOcdqsWD7SiaL45cWM1v8f/Sa1eLGrzZWi94FV9ksNj2+xmpx5H8/o8WM8/uYLJZe v8hk8eH+RWaL42vDHfg9WvdOYPNYM28No8eCTaUed67tYfPYvKTe48arhUwefVtWMXpsvzaP 2WPz6WqPz5vkAriiGhhtMlITU1KLFFLzkvNTMvPSbZW8g+Od403NDAx1DS0tzJUU8hJzU22V XHwCdN0yc4BeUFIoS8wpBQoFJBYXK+nbYZoQGuKmawHTGKHrGxIE12NkgAYS1jBmTPy3k7Vg lVLFoTV/mRoYn0t3MXJySAiYSHScWcQGYYtJXLi3Hsjm4hASWMQosfHRPUYIp41J4tXqw0wg VWwCOhLbvx0Hs0UENCU6t68E62AWOMkscf9HK9goYYFMibPfu4GKODhYBFQlJj6JAgnzCrhJ tO59CRaWEFCQmDPJBiTMKeAu8WZtDyOILQRU8ru9nX0CI+8CRoZVjKKpBckFxUnpuUZ6xYm5 xaV56XrJ+bmbGMGx+0x6B+OqBotDjAIcjEo8vD9MbgYLsSaWFVfmHmKU4GBWEuE9uAAoxJuS WFmVWpQfX1Sak1p8iNEU6KaJzFKiyfnAtJJXEm9obGJmZGlkbmhhZGyuJM57sNU6UEggPbEk NTs1tSC1CKaPiYNTqoFxuV4RV6hbemd+U7Hb9EeXr+8LNlCdstLorupWtbOJC+q2i109lqbL sSrgYuT+TJ70IGuOia8f3as/k2l17N9tL5tjmSxtk5YWqGc7n77+QaJ3C5/CuckPbzjHnk0M rsl5FcS0Yo+nxAVJ27ieLWd9NujnNZ15qLj77ouLXE9n6D65tO2BZmCDEktxRqKhFnNRcSIA zGvtavMCAAA= 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=-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 all 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; };