From patchwork Thu Jul 10 07:08: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: 4521231 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 22C609F26C for ; Thu, 10 Jul 2014 07:09:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A8CE202FF for ; Thu, 10 Jul 2014 07:09:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E9722026F for ; Thu, 10 Jul 2014 07:09:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751645AbaGJHJB (ORCPT ); Thu, 10 Jul 2014 03:09:01 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:36421 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751594AbaGJHIr (ORCPT ); Thu, 10 Jul 2014 03:08:47 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8H00ETSIIILOC0@mailout4.samsung.com>; Thu, 10 Jul 2014 16:08:42 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.112]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 4B.A1.14704.AFB3EB35; Thu, 10 Jul 2014 16:08:42 +0900 (KST) X-AuditID: cbfee68f-b7fef6d000003970-03-53be3bfa57a4 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 43.80.05196.9FB3EB35; Thu, 10 Jul 2014 16:08: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 <0N8H00B7PIIH4WS1@mmp2.samsung.com>; Thu, 10 Jul 2014 16:08:41 +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: [PATCHv3 1/5] mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed Date: Thu, 10 Jul 2014 16:08:35 +0900 Message-id: <1404976119-10777-2-git-send-email-jh80.chung@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1404976119-10777-1-git-send-email-jh80.chung@samsung.com> References: <1404976119-10777-1-git-send-email-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRmVeSWpSXmKPExsWyRsSkQPeX9b5gg8cP2S0mXN7OaDH/yDlW i+OXFjNb/H/0mtXixq82VoveBVfZLDY9vsZqceR/P6PFjPP7mCyWXr/IZPHh/kVmi+Nrwx14 PFr3TmDzWDNvDaPHnWt72Dw2L6n3uPFqIZNH35ZVjB7br81j9vi8SS6AI4rLJiU1J7MstUjf LoErY+fmBewFtxQqOm9VNDBukOpi5OSQEDCR2HblADOELSZx4d56ti5GLg4hgaWMEme+32WG Kbrx5jgzRGI6o8T7aVeYIJw2Jonpj5qZQKrYBHQktn87DmaLCGhKdG5fCTaKWeAKk8TZO1tY QRLCApkSt889AxvLIqAqceTLV3YQm1fATaL30H+gGg6gdQoScybZgIQ5BdwllszpZgOxhYBK DvSsZgWZKSFwjl3i1q4WVog5AhLfJh9igeiVldgE846kxMEVN1gmMAovYGRYxSiaWpBcUJyU XmSsV5yYW1yal66XnJ+7iREYM6f/PevfwXj3gPUhxmSgcROZpUST84Exl1cSb2hsZmRhamJq bGRuaUaasJI47/2HSUFCAumJJanZqakFqUXxRaU5qcWHGJk4OKUaGLc8DbCbGrqUz32rjdRm lVPTilRquXd82Bp47/G3xCVXxRoarTTNEiUW/HFTaY290bjSIt55X9mN/rYNqm8cuWP2b1TZ E/Fm10qZQsOnpybnrtry8ot6VXhM1frj/BElv4sEJugZtrSaspmeOyImtSfOWfLFUrlTTBJX dqt7McV9eZZ6fubJD0osxRmJhlrMRcWJAM503lyvAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t9jQd2f1vuCDT732VhMuLyd0WL+kXOs FscvLWa2+P/oNavFjV9trBa9C66yWWx6fI3V4sj/fkaLGef3MVksvX6RyeLD/YvMFsfXhjvw eLTuncDmsWbeGkaPO9f2sHlsXlLvcePVQiaPvi2rGD22X5vH7PF5k1wAR1QDo01GamJKapFC al5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0LVKCmWJOaVAoYDE4mIl fTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoydmxewF9xSqOi8VdHAuEGqi5GTQ0LAROLGm+PM ELaYxIV769m6GLk4hASmM0q8n3aFCcJpY5KY/qiZCaSKTUBHYvu342C2iICmROf2lWAdzAJX mCTO3tnCCpIQFsiUuH3uGdhYFgFViSNfvrKD2LwCbhK9h/4D1XAArVOQmDPJBiTMKeAusWRO NxuILQRUcqBnNesERt4FjAyrGEVTC5ILipPSc430ihNzi0vz0vWS83M3MYIj8pn0DsZVDRaH GAU4GJV4eBt69gYLsSaWFVfmHmKU4GBWEuH1+A8U4k1JrKxKLcqPLyrNSS0+xGgKdNREZinR 5HxgssgriTc0NjEzsjQyN7QwMjZXEuc92GodKCSQnliSmp2aWpBaBNPHxMEp1cCoaSQsdcc9 qDRLa3nyHIv9Ibr6nEVRBt0xvmL5fWp2Llv6T57bl2bimq5k6jfdq+OyUoHZl0fs6Z1/GZv2 rEme9Ust81hhvpJg5ZvYUl72rGjmmN0m03fWBWyed9TxpK+LraqRq4d61Y2y1kUXiz9YnZ4c WXEmeFfzxtnz4l4539TS8fjopcRSnJFoqMVcVJwIAFNi+o7eAgAA 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 --- .../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; };