From patchwork Thu Jul 10 09:48:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 4522561 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 1ECB9BEEAA for ; Thu, 10 Jul 2014 09:48:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44FEA20351 for ; Thu, 10 Jul 2014 09:48:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AD612010E for ; Thu, 10 Jul 2014 09:48:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752994AbaGJJsv (ORCPT ); Thu, 10 Jul 2014 05:48:51 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:41628 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752353AbaGJJso (ORCPT ); Thu, 10 Jul 2014 05:48:44 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8H00ARRPX32Z80@mailout1.samsung.com>; Thu, 10 Jul 2014 18:48:39 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.116]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 61.AC.16580.7716EB35; Thu, 10 Jul 2014 18:48:39 +0900 (KST) X-AuditID: cbfee691-b7f2f6d0000040c4-c3-53be6177330c Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 11.FA.05196.7716EB35; Thu, 10 Jul 2014 18:48:39 +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 <0N8H001N4PX3ZN30@mmp1.samsung.com>; Thu, 10 Jul 2014 18:48:39 +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: [PATCHv4 1/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Thu, 10 Jul 2014 18:48:34 +0900 Message-id: <1404985718-12203-2-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1404985718-12203-1-git-send-email-jh80.chung@samsung.com> References: <1404985718-12203-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsWyRsSkRLc8cV+wwbGpKhYTLm9ntJh/5Byr xfFLi5kt/j96zWpx41cbq0XvgqtsFpseX2O1OPK/n9Fixvl9TBZLr19ksvhw/yKzxfG14Q48 Hq17J7B5rJm3htHjzrU9bB6bl9R73Hi1kMmjb8sqRo/t1+Yxe3zeJBfAEcVlk5Kak1mWWqRv l8CVsXPzAvaCWwoVnbcqGhg3SHUxcnJICJhIHJ+yhhXCFpO4cG89G4gtJLCUUWL+KjWYmv6m 4yxdjFxA8UWMEvNunIdy2pgk9q5fzQJSxSagI7H923EmEFtEQFOic/tKNpAiZoErTBJn72wB WyEskClx6sluRhCbRUBV4uScQ2A2r4CbRN+3LiCbA2idgsScSTYgYU4Bd4mF768xQVzkJrF/ 6mRmkJkSApfYJZ69/sQKMUdA4tvkQywQvbISmw4wQ1wtKXFwxQ2WCYzCCxgZVjGKphYkFxQn pReZ6hUn5haX5qXrJefnbmIERszpf88m7mC8f8D6EGMy0LiJzFKiyfnAiMsriTc0NjOyMDUx NTYytzQjTVhJnDf9UVKQkEB6YklqdmpqQWpRfFFpTmrxIUYmDk6pBsaTrQotf7Wd9HVyHrPc 2bloQc5dZ2XvSOZt74Xr6suNr37csfDMx+pZ1uVn7M8cX6BmbJgYnu7ME30igmX3rn08ZeYS 2fydS2LqZrm7PCr8IN05qXAbZy5zkKxV1fwlHLOTMj//mbTnRrDGdoGZfbacQnFGGZMNn/fP fxrmpftCOq9/e2ZrshJLcUaioRZzUXEiAPoN3+quAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t9jAd3yxH3BBo+nSFtMuLyd0WL+kXOs FscvLWa2+P/oNavFjV9trBa9C66yWWx6fI3V4sj/fkaLGef3MVksvX6RyeLD/YvMFsfXhjvw eLTuncDmsWbeGkaPO9f2sHlsXlLvcePVQiaPvi2rGD22X5vH7PF5k1wAR1QDo01GamJKapFC al5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0LVKCmWJOaVAoYDE4mIl fTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoydmxewF9xSqOi8VdHAuEGqi5GTQ0LARKK/6TgL hC0mceHeerYuRi4OIYFFjBLzbpxngXDamCT2rl8NVsUmoCOx/dtxJhBbREBTonP7SrAOZoEr TBJn72xhBUkIC2RKnHqymxHEZhFQlTg55xCYzSvgJtH3rQvI5gBapyAxZ5INSJhTwF1i4ftr YDOFgEr2T53MPIGRdwEjwypG0dSC5ILipPRcI73ixNzi0rx0veT83E2M4Ih8Jr2DcVWDxSFG AQ5GJR7ehp69wUKsiWXFlbmHGCU4mJVEeLfZ7QsW4k1JrKxKLcqPLyrNSS0+xGgKdNREZinR 5HxgssgriTc0NjEzsjQyN7QwMjZXEuc92GodKCSQnliSmp2aWpBaBNPHxMEp1cDonNcediO8 5ZLQ4kdr6+rbKn9nrusuyjAV14qSmSNxPfWsc/GntobCdZrnvdUnvnXd+05qLefUqelKD/0e hDn5xmyJOPvr0PWPP9ivZbnUlD/9NnkHd9DqNdnnHlivZJs35fP0+Qt1Zlw3qEqxvffez7zD 8NFF1UvrHrm+KVYqfepkE1KlK/5UiaU4I9FQi7moOBEAkXdUcd4CAAA= 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 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 --- .../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; };