From patchwork Fri Mar 21 12:14:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3873851 Return-Path: X-Original-To: patchwork-linux-arm@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 A9218BF540 for ; Fri, 21 Mar 2014 12:48:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F9E320212 for ; Fri, 21 Mar 2014 12:48:01 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81C84201FD for ; Fri, 21 Mar 2014 12:48:00 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyOH-0007rJ-Bh; Fri, 21 Mar 2014 12:17:39 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyNV-0003RP-1X; Fri, 21 Mar 2014 12:16:49 +0000 Received: from mail-lb0-f175.google.com ([209.85.217.175]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyM8-0003GI-Sd for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 12:15:26 +0000 Received: by mail-lb0-f175.google.com with SMTP id w7so1562733lbi.6 for ; Fri, 21 Mar 2014 05:15:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=04lU18RX8DdjfXN2LZb7N8GmKkk9ceoaVWr/mzaHP+U=; b=djqfJytkanN6HGvQ8TkvMGN35k+wgzeyxqxWO4XkNPDmoZjzrlssrzlmPUlaOed9NZ oyuJSRTcd9/wPfFyTcnFy0PXv0TNdnYBq/KkdgSavWkH4SQuQdcBCYZ4/VLx0m41KzbH k705gapOQ367TGGOSKYh6s+ADarPJtUFEmimx0ajy6ZV2w9Vi5650JFoA049rBVM3UMI rzScHO7GxMoqqI2rQy8KDuybQ9iPKJ08pQGmnn+o9wzGzyqXvAkKRx8ahTeFxHcQQ+YF mOmWgG1RqLe6EuGChMi11gI2fGvOd4Us6Wu2xpIqt2+FoNKyMZdTR4BAqUQSP7iJ3GMQ gNmg== X-Gm-Message-State: ALoCoQkjlWTAEQWPR/nwrHVSZYcqrHeyFajmENGY+zeCBlCWtuzQsYlpZV4RvdzGrjRQgvugK+Ni X-Received: by 10.153.7.200 with SMTP id de8mr33788865lad.19.1395404102694; Fri, 21 Mar 2014 05:15:02 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id tq9sm3255263lbb.10.2014.03.21.05.15.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:02 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Subject: [PATCH 11/20] mmc: mmci: Mark the DT bindings for highspeed mode as deprecated Date: Fri, 21 Mar 2014 13:14:08 +0100 Message-Id: <1395404057-27835-12-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395404057-27835-1-git-send-email-ulf.hansson@linaro.org> References: <1395404057-27835-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140321_081525_151004_A51C50DF X-CRM114-Status: UNSURE ( 8.00 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, Ulf Hansson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 The common mmc DT parser supports bindings for highspeed mode, thus there are no need for mmci to provide it's own versions for these. Mark them as deprecated in the documentation. Signed-off-by: Ulf Hansson --- Documentation/devicetree/bindings/mmc/mmci.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/mmci.txt b/Documentation/devicetree/bindings/mmc/mmci.txt index eb9ad86..f9fbcb4 100644 --- a/Documentation/devicetree/bindings/mmc/mmci.txt +++ b/Documentation/devicetree/bindings/mmc/mmci.txt @@ -12,11 +12,13 @@ Required properties: - vmmc-supply : phandle to the regulator device tree node. Optional properties: -- mmc-cap-mmc-highspeed : indicates whether MMC is high speed capable. -- mmc-cap-sd-highspeed : indicates whether SD is high speed capable. - vqmmc-supply : phandle to the regulator device tree node. - signal-direction : a bit pattern, indicating bus signals directions. +Deprecated properties: +- mmc-cap-mmc-highspeed : indicates whether MMC is high speed capable. +- mmc-cap-sd-highspeed : indicates whether SD is high speed capable. + Example: sdi0_per1@80126000 { @@ -34,8 +36,8 @@ sdi0_per1@80126000 { max-frequency = <100000000>; bus-width = <4>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; + cap-sd-highspeed; + cap-mmc-highspeed; cd-gpios = <&gpio2 31 0x4>; // 95 signal-direction = <(MCI_ST_DATA2DIREN | MCI_ST_CMDDIREN |