From patchwork Fri Jul 11 03:49:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4529861 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 A8C2F9F26C for ; Fri, 11 Jul 2014 03:49:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C2F96201D5 for ; Fri, 11 Jul 2014 03:49:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A61D9201F4 for ; Fri, 11 Jul 2014 03:49:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751950AbaGKDtw (ORCPT ); Thu, 10 Jul 2014 23:49:52 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:60138 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751585AbaGKDtv (ORCPT ); Thu, 10 Jul 2014 23:49:51 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8J00DA23Z13390@mailout2.samsung.com>; Fri, 11 Jul 2014 12:49:49 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id D8.E7.13369.CDE5FB35; Fri, 11 Jul 2014 12:49:49 +0900 (KST) X-AuditID: cbfee690-b7fb56d000003439-88-53bf5edc119d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B2.26.05196.CDE5FB35; Fri, 11 Jul 2014 12:49:48 +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 <0N8J009YR3Z090Z0@mmp2.samsung.com>; Fri, 11 Jul 2014 12:49:48 +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: [PATCHv5 1/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Fri, 11 Jul 2014 12:49:43 +0900 Message-id: <1405050587-5577-2-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1405050587-5577-1-git-send-email-jh80.chung@samsung.com> References: <1405050587-5577-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsWyRsSkUPdu3P5gg6eX2SwmXN7OaDH/yDlW i+OXFjNb/H/0mtXixq82VoveBVfZLDY9vsZqceR/P6PFjPP7mCyWXr/IZPHh/kVmi+Nrwx14 PFr3TmDzWDNvDaPHnWt72Dw2L6n3uPFqIZNH35ZVjB7br81j9vi8SS6AI4rLJiU1J7MstUjf LoEr4/7Pl2wFXYoV135sZGxgvC3VxcjJISFgItEy4w4LhC0mceHeerYuRi4OIYGljBJrO3cw dTFygBUd+W0OEZ/OKLHn2DZ2kAYhgTYmif4FKiA2m4COxPZvx5lAbBEBTYnO7SvBBjELXGGS OHtnCytIQlggU+L2q3lgzSwCqhJ/Fvcxgti8Aq4S5xs/s0MsU5CYM8kGJMwp4CaxfNcDVohd rhIdjRuYQWZKCFxjl1hz9CUTxBwBiW+TD7FA9MpKbDrADPGMpMTBFTdYJjAKL2BkWMUomlqQ XFCclF5kolecmFtcmpeul5yfu4kRGDGn/z2bsIPx3gHrQ4zJQOMmMkuJJucDIy6vJN7Q2MzI wtTE1NjI3NKMNGElcV61R0lBQgLpiSWp2ampBalF8UWlOanFhxiZODilGhiXhGwWe2aStOjO 1SsMdol/PY7UMrzr/5Au7+11b3bNQkOlGYbTb2u6WVTpaq04d/DAE7HDb+cXu2r9vcSXW+Qs f3R+vqPX/y1qC1vjAjVWy/RIm6ge85snpZGfoX3nfmy/w1SVrhhhyb9LDq71tJxfpOez4YZk 3JVFTcart1d6vQ/h5GJov6nEUpyRaKjFXFScCABERTS9rgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFIsWRmVeSWpSXmKPExsVy+t9jQd07cfuDDdZesbKYcHk7o8X8I+dY LY5fWsxs8f/Ra1aLG7/aWC16F1xls9j0+BqrxZH//YwWM87vY7JYev0ik8WH+xeZLY6vDXfg 8WjdO4HNY828NYwed67tYfPYvKTe48arhUwefVtWMXpsvzaP2ePzJrkAjqgGRpuM1MSU1CKF 1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoGuVFMoSc0qBQgGJxcVK +naYJoSGuOlawDRG6PqGBMH1GBmggYQ1jBn3f75kK+hSrLj2YyNjA+NtqS5GDg4JAROJI7/N uxg5gUwxiQv31rN1MXJxCAlMZ5TYc2wbO0hCSKCNSaJ/gQqIzSagI7H923EmEFtEQFOic/tK sAZmgStMEmfvbGEFSQgLZErcfjUPrJlFQFXiz+I+RhCbV8BV4nzjZ3aIxQoScybZgIQ5Bdwk lu96wAqxy1Wio3ED8wRG3gWMDKsYRVMLkguKk9JzjfSKE3OLS/PS9ZLzczcxguPxmfQOxlUN FocYBTgYlXh4T6zZFyzEmlhWXJl7iFGCg1lJhHcG9/5gId6UxMqq1KL8+KLSnNTiQ4ymQEdN ZJYSTc4Hpoq8knhDYxMzI0sjc0MLI2NzJXHeg63WgUIC6YklqdmpqQWpRTB9TBycUg2M1SGt 5UX9x7sqRHe8mnZNvvjQPsGKy3NFWVe/za68F5T+euGctMderxOYPz642zBbsFHnkmqBySFF d9OMdU/DHB18XhbMX6LyS3TmZ8ENkS1u+ReurVjRtrjit5iiy4f/1UJMCrPWP3kdJpod2niv bKMsM9Nps79iK9f3f/hnEex2oYanKDFLiaU4I9FQi7moOBEA0B7Ckt0CAAA= 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 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; };