From patchwork Thu Aug 7 07:37:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4689911 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 4E257C033A for ; Thu, 7 Aug 2014 07:38:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65D61201DD for ; Thu, 7 Aug 2014 07:38:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D119201DC for ; Thu, 7 Aug 2014 07:38:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756945AbaHGHiP (ORCPT ); Thu, 7 Aug 2014 03:38:15 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:47715 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754556AbaHGHiI (ORCPT ); Thu, 7 Aug 2014 03:38:08 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N9X003FDEJGZL00@mailout3.samsung.com>; Thu, 07 Aug 2014 16:38:04 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.115]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 60.4C.25328.CDC23E35; Thu, 07 Aug 2014 16:38:04 +0900 (KST) X-AuditID: cbfee68d-b7f2f6d0000062f0-a7-53e32cdc00f5 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 11.12.04943.BDC23E35; Thu, 07 Aug 2014 16:38:04 +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 <0N9X00GKSEJFIBL0@mmp2.samsung.com>; Thu, 07 Aug 2014 16:38:03 +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: [PATCHv10 2/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Thu, 07 Aug 2014 16:37:59 +0900 Message-id: <1407397082-32495-3-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1407397082-32495-1-git-send-email-jh80.chung@samsung.com> References: <1407397082-32495-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsWyRsSkWPeOzuNgg2Uv+S0mXN7OaDH/yDlW i+OXFjNb/H/0mtXixq82VoveBVfZLDY9vsZqceR/P6PFjPP7mCyWXr/IZPHh/kVmi+Nrwx14 PFr3TmDzWDNvDaPHnWt72Dw2L6n3uPFqIZNH35ZVjB7br81j9vi8SS6AI4rLJiU1J7MstUjf LoErY+K/nawFq5QqDq35y9TA+Fy6i5GTQ0LARGJf311GCFtM4sK99WxdjFwcQgJLGSVmTbjC DlO0au9TFhBbSGA6o8T+lRwQRW1MEq+2vwMrYhPQkdj+7TgTiC0ioCnRuX0l2CRmgStMEmfv bGEFSQgLZEl8Oz0frIFFQFViy+djYDavgJvE31stQM0cQNsUJOZMsgEJcwq4Syxa8YQJYrGb xP77bVAHXWOXuLfZG2KMgMS3yYdYIFplJTYdYIYokZQ4uOIGywRG4QWMDKsYRVMLkguKk9KL DPWKE3OLS/PS9ZLzczcxAiPm9L9nvTsYbx+wPsSYDDRuIrOUaHI+MOLySuINjc2MLExNTI2N zC3NSBNWEudNepgUJCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoFRheOb3V7pSQ38OtIl7b06 W73K1JeJFDEvP/g02YDZ2fzivfMTuk6ePh0UoXsnp3D2tsoL0dc8kxZPbzKQzuKOmdIufkCb J0yFT4axKy3Qnq3K+teWuK1y2cm+4blx29Z6NW7eVnV/32YG3fpXUxrNFba4Vl5RO3C5RfJs zQTBzKiTMyu3L1JiKc5INNRiLipOBAATVV6lrgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t9jQd07Oo+DDVaeY7OYcHk7o8X8I+dY LY5fWsxs8f/Ra1aLG7/aWC16F1xls9j0+BqrxZH//YwWM87vY7JYev0ik8WH+xeZLY6vDXfg 8WjdO4HNY828NYwed67tYfPYvKTe48arhUwefVtWMXpsvzaP2ePzJrkAjqgGRpuM1MSU1CKF 1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoGuVFMoSc0qBQgGJxcVK +naYJoSGuOlawDRG6PqGBMH1GBmggYQ1jBkT/+1kLVilVHFozV+mBsbn0l2MnBwSAiYSq/Y+ ZYGwxSQu3FvPBmILCUxnlNi/kqOLkQvIbmOSeLX9HTtIgk1AR2L7t+NMILaIgKZE5/aVbCBF zAJXmCTO3tnCCpIQFsiS+HZ6PlgDi4CqxJbPx8BsXgE3ib+3WoCaOYC2KUjMmWQDEuYUcJdY tOIJE8RiN4n999vYJzDyLmBkWMUomlqQXFCclJ5rqFecmFtcmpeul5yfu4kRHJHPpHYwrmyw OMQowMGoxMNr0fQoWIg1say4MvcQowQHs5II7yu+x8FCvCmJlVWpRfnxRaU5qcWHGE2BjprI LCWanA9MFnkl8YbGJmZGlkbmhhZGxuZK4rwHWq0DhQTSE0tSs1NTC1KLYPqYODilGhibtljG aT3XcLSe8ruJZU5o7jRmkWU3ghJOyE758dTd4/nvVQFZGy6em62/Y+m2Uzv/XX7BvLHyT8OL gLibrIaM+yKMPPSP22zSfn3y2ZqN6grvFbW1f3WFsOkfO3Si78SEpamR+/UyOyKftl8o9+W9 OXHdco2i5L5DXlwrhWTmJ/+4deiPybFMJZbijERDLeai4kQAzHWtm94CAAA= 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 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; };