From patchwork Fri Oct 6 19:21:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 822678 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y80213yP9z9t2c for ; Sat, 7 Oct 2017 06:24:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752729AbdJFTX2 (ORCPT ); Fri, 6 Oct 2017 15:23:28 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:40000 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752303AbdJFTWD (ORCPT ); Fri, 6 Oct 2017 15:22:03 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from lsun@mellanox.com) with ESMTPS (AES256-SHA encrypted); 6 Oct 2017 21:21:59 +0200 Received: from lab-14.internal.tilera.com (lab-14.internal.tilera.com [10.15.8.98]) by mtbu-labmail01.internal.tilera.com (8.14.4/8.14.4) with ESMTP id v96JLv0a027636; Fri, 6 Oct 2017 15:21:57 -0400 Received: (from lsun@localhost) by lab-14.internal.tilera.com (8.14.7/8.13.8/Submit) id v96JLvVl016250; Fri, 6 Oct 2017 15:21:57 -0400 From: Liming Sun To: Ulf Hansson , Rob Herring , Mark Rutland Cc: Liming Sun , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/9] Revert "Documentation: dw-mshc: deprecate num-slots" Date: Fri, 6 Oct 2017 15:21:24 -0400 Message-Id: <7deccd8a59339ef0ca5c1d54eb453d040b7df594.1507315433.git.lsun@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This reverts commit 3f5b4b79d4c0fa71fd7d74c2a44bbc0869c04c9b. The Mellanox BlueField SoC requires multiple slot dw-mmc support. Signed-off-by: Liming Sun Acked-by: Rob Herring --- .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt index ef3e5f1..9cb55ca 100644 --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt @@ -12,12 +12,12 @@ Required Properties: * #address-cells: should be 1. * #size-cells: should be 0. -# Slots (DEPRECATED): The slot specific information are contained within - child-nodes with each child-node representing a supported slot. There should - be atleast one child node representing a card slot. The name of the child node - representing the slot is recommended to be slot@n where n is the unique number - of the slot connected to the controller. The following are optional properties - which can be included in the slot child node. +# Slots: The slot specific information are contained within child-nodes with + each child-node representing a supported slot. There should be atleast one + child node representing a card slot. The name of the child node representing + the slot is recommended to be slot@n where n is the unique number of the slot + connected to the controller. The following are optional properties which + can be included in the slot child node. * reg: specifies the physical slot number. The valid values of this property is 0 to (num-slots -1), where num-slots is the value @@ -63,7 +63,7 @@ Optional properties: clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default. (Use the "max-frequency" instead of "clock-freq-min-max".) -* num-slots (DEPRECATED): specifies the number of slots supported by the controller. +* num-slots: specifies the number of slots supported by the controller. The number of physical slots actually used could be equal or less than the value specified by num-slots. If this property is not specified, the value of num-slot property is assumed to be 1. @@ -124,6 +124,7 @@ board specific portions as listed below. dwmmc0@12200000 { clock-frequency = <400000000>; clock-freq-min-max = <400000 200000000>; + num-slots = <1>; broken-cd; fifo-depth = <0x80>; card-detect-delay = <200>; @@ -138,6 +139,7 @@ board specific portions as listed below. dwmmc0@12200000 { clock-frequency = <400000000>; clock-freq-min-max = <400000 200000000>; + num-slots = <1>; broken-cd; fifo-depth = <0x80>; card-detect-delay = <200>;