From patchwork Mon Jul 28 02:29:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 374069 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 28DAE1400F1 for ; Mon, 28 Jul 2014 12:29:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751440AbaG1C3u (ORCPT ); Sun, 27 Jul 2014 22:29:50 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:28104 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751480AbaG1C3o (ORCPT ); Sun, 27 Jul 2014 22:29:44 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N9E002AUHLH8D30@mailout1.samsung.com>; Mon, 28 Jul 2014 11:29:41 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.115]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id AA.CA.19786.595B5D35; Mon, 28 Jul 2014 11:29:41 +0900 (KST) X-AuditID: cbfee68e-b7fab6d000004d4a-4f-53d5b595f603 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B9.9D.05196.595B5D35; Mon, 28 Jul 2014 11:29:41 +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 <0N9E00LI2HLGTD40@mmp2.samsung.com>; Mon, 28 Jul 2014 11:29:40 +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, afaerber@suse.de, Jaehoon Chung Subject: [PATCHv7 1/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Mon, 28 Jul 2014 11:29:35 +0900 Message-id: <1406514579-3769-2-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1406514579-3769-1-git-send-email-jh80.chung@samsung.com> References: <1406514579-3769-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsWyRsSkWHfq1qvBBr0bpS2aNxVbTLi8ndFi /pFzrBbHLy1mtvj/6DWrxY1fbawWvQuusllsenyN1eLI/35Gixnn9zFZLL1+kcniw/2LzBbH 14Y78Hq07p3A5rFm3hpGjzvX9rB5bF5S73Hj1UImj74tqxg9tl+bx+yx+XS1x+dNcgGcUVw2 Kak5mWWpRfp2CVwZi58+Yi34pFjx4fhS1gbGrdJdjJwcEgImEpMaJ7JA2GISF+6tZ+ti5OIQ EljKKHG2bykLTNHlB3NZIRLTGSVmHFjLDOG0MUlcuNDJBFLFJqAjsf3bcTBbREBTonP7SrBR zAIvmCR+rpnPDpIQFsiU+L15PjOIzSKgKtH28jQjiM0r4CpxbtZKoBUcQOsUJOZMsgEJcwq4 SSw7tIARJCwEVHL/thvISAmBe+wSE2Y3sUGMEZD4NvkQC0SrrMSmA8wQR0tKHFxxg2UCo/AC RoZVjKKpBckFxUnpRUZ6xYm5xaV56XrJ+bmbGIExdPrfs74djDcPWB9iTAYaN5FZSjQ5HxiD eSXxhsZmRhamJqbGRuaWZqQJK4nzLnqYFCQkkJ5YkpqdmlqQWhRfVJqTWnyIkYmDU6qBMaw5 9sxci08n2x1PCvGtit99tW3nAwv1hdzXE78pX2yfZm7k/vay7AHvjR9ilgSq6/fzCojL79/9 vymp9kH8NinNkEMq/b/9FyuuPvJ8r3BgeWSJ1tOpT5TT7vRW/9KofPb7acQ8F4dbMpOY/BSN epMCDITmzd62Pi7j3rJrYXuiKo/Z22jMVGIpzkg01GIuKk4EANN+XWq3AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMIsWRmVeSWpSXmKPExsVy+t9jQd2pW68GG5ybIGTRvKnYYsLl7YwW 84+cY7U4fmkxs8X/R69ZLW78amO16F1wlc1i0+NrrBZH/vczWsw4v4/JYun1i0wWH+5fZLY4 vjbcgdejde8ENo8189Ywety5tofNY/OSeo8brxYyefRtWcXosf3aPGaPzaerPT5vkgvgjGpg tMlITUxJLVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wBulpJoSwx pxQoFJBYXKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjDmLH46SPWgk+KFR+OL2VtYNwq3cXI ySEhYCJx+cFcVghbTOLCvfVsXYxcHEIC0xklZhxYywzhtDFJXLjQyQRSxSagI7H923EwW0RA U6Jz+0qwDmaBF0wSP9fMZwdJCAtkSvzePJ8ZxGYRUJVoe3maEcTmFXCVODdrJdA6DqB1ChJz JtmAhDkF3CSWHVrACBIWAiq5f9ttAiPvAkaGVYyiqQXJBcVJ6blGesWJucWleel6yfm5mxjB EfpMegfjqgaLQ4wCHIxKPLwWwVeDhVgTy4orcw8xSnAwK4nwvmwHCvGmJFZWpRblxxeV5qQW H2I0BbppIrOUaHI+MHnklcQbGpuYGVkamRtaGBmbK4nzHmy1DhQSSE8sSc1OTS1ILYLpY+Lg lGpgnLjvR9eRuatKOR/vnP7+z7f1CzVXcXqoJ7LWL439ymKYbpyfsuWnhGVq2NkzV/fPlykT txW38/zzIExmkvx3Hp/dr6eaKzfvYbEzYBPv5BK9d+XPrZqLM/9cN9By6S1RkT632Wvl/ged xvObE5ekFexcmtvG9ylvVZ6A0ZU48+4Db85xKzcsVGIpzkg01GIuKk4EALj+P5/mAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 --- .../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; };