From patchwork Mon Jun 30 11:49:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4447631 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 D29EDBEECB for ; Mon, 30 Jun 2014 11:49:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E7F8A20328 for ; Mon, 30 Jun 2014 11:49:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB17A2035C for ; Mon, 30 Jun 2014 11:49:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888AbaF3Ltt (ORCPT ); Mon, 30 Jun 2014 07:49:49 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:28547 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751302AbaF3LtY (ORCPT ); Mon, 30 Jun 2014 07:49:24 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7Z00CCCCU91QD0@mailout1.samsung.com>; Mon, 30 Jun 2014 20:49:21 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.113]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id B2.73.13369.1CE41B35; Mon, 30 Jun 2014 20:49:21 +0900 (KST) X-AuditID: cbfee690-b7fb56d000003439-e1-53b14ec13e20 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id F8.B5.04943.1CE41B35; Mon, 30 Jun 2014 20:49:21 +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 <0N7Z00M3ICU8GQ30@mmp1.samsung.com>; Mon, 30 Jun 2014 20:49:21 +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: [PATCHv2 1/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Mon, 30 Jun 2014 20:49:15 +0900 Message-id: <1404128960-27225-2-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1404128960-27225-1-git-send-email-jh80.chung@samsung.com> References: <1404128960-27225-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRmVeSWpSXmKPExsWyRsSkUPeg38Zgg13NMhYTLm9ntJh/5Byr xfFLi5kt/j96zWpx41cbq0XvgqtsFpseX2O1OPK/n9Fixvl9TBZLr19ksvhw/yKzxfG14Q48 Hq17J7B5rJm3htHjzrU9bB6bl9R73Hi1kMmjb8sqRo/t1+Yxe3zeJBfAEcVlk5Kak1mWWqRv l8CV8bB9MXPBMoWKi9f+szUwNkp1MXJySAiYSHzetZcZwhaTuHBvPVsXIxeHkMBSRontcxYz wxStOrKbHSKxiFFiQf8aKKeNSWLZp49MIFVsAjoS278dB7NFBDQlOrevBBvFLHCFSeLsnS2s IAlhgUyJN82/wWwWAVWJxXfngtm8Am4S836dBWrgAFqnIDFnkg1ImFPAXaJ5zzSwK4SASmb3 fmKDuOgSu0TnA1+IMQIS3yYfYoFolZXYdADqaEmJgytusExgFF7AyLCKUTS1ILmgOCm9yESv ODG3uDQvXS85P3cTIzBmTv97NmEH470D1ocYk4HGTWSWEk3OB8ZcXkm8obGZkYWpiamxkbml GWnCSuK8ao+SgoQE0hNLUrNTUwtSi+KLSnNSiw8xMnFwSjUwyn30spz7USsxPsDk47r/vTu3 Lym2ijWL7ZbP+Xc89+M23pLc7g3KxgvnK08oE61a0Pmo5w5HYkf2mslzMl9ui+T+W+z2KHfP z+eJ2qdUmN7L1gks2HBmgdLKu29/PDtVX3u0IOpV820dQXbGE7nRp8XuV1WVlaVfiptZfepO XVW36JKclPuLlFiKMxINtZiLihMBlJwGn68CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsVy+t9jAd2DfhuDDXpmCFtMuLyd0WL+kXOs FscvLWa2+P/oNavFjV9trBa9C66yWWx6fI3V4sj/fkaLGef3MVksvX6RyeLD/YvMFsfXhjvw eLTuncDmsWbeGkaPO9f2sHlsXlLvcePVQiaPvi2rGD22X5vH7PF5k1wAR1QDo01GamJKapFC al5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0LVKCmWJOaVAoYDE4mIl fTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoyH7YuZC5YpVFy89p+tgbFRqouRk0NCwERi1ZHd 7BC2mMSFe+vZuhi5OIQEFjFKLOhfww7htDFJLPv0kQmkik1AR2L7t+NgtoiApkTn9pVgHcwC V5gkzt7ZwgqSEBbIlHjT/BvMZhFQlVh8dy6YzSvgJjHv11mgBg6gdQoScybZgIQ5BdwlmvdM YwaxhYBKZvd+YpvAyLuAkWEVo2hqQXJBcVJ6rqFecWJucWleul5yfu4mRnBMPpPawbiyweIQ owAHoxIPr8ayDcFCrIllxZW5hxglOJiVRHhv+mwMFuJNSaysSi3Kjy8qzUktPsRoCnTURGYp 0eR8YLrIK4k3NDYxM7I0Mje0MDI2VxLnPdBqHSgkkJ5YkpqdmlqQWgTTx8TBKdXA6Hp92nN3 11WOh8R4Ui+dvxPn/+yA8OOVJeE/+17NL7vkWJ/FfMWvYupG49XNnRtSTvkL7rc7ELhDsf6l 9xNl/UfTNffv5r/mdH1mrqZq3kGXbMk5Yjphvye0e/1M3PZv2ccPUxLu+4swTCm5m7t48tvn ZR5ljS7u+VuYlrFelmaMf3n6x8QP/5VYijMSDbWYi4oTAWwyreXfAgAA 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, 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; };