From patchwork Fri Feb 14 12:27:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3652371 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 E4FCDBF13A for ; Fri, 14 Feb 2014 12:27:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17B232021C for ; Fri, 14 Feb 2014 12:27:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 310402021E for ; Fri, 14 Feb 2014 12:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752440AbaBNM1R (ORCPT ); Fri, 14 Feb 2014 07:27:17 -0500 Received: from mail-la0-f43.google.com ([209.85.215.43]:36071 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751957AbaBNM1P (ORCPT ); Fri, 14 Feb 2014 07:27:15 -0500 Received: by mail-la0-f43.google.com with SMTP id pv20so9161793lab.2 for ; Fri, 14 Feb 2014 04:27:13 -0800 (PST) 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; bh=ke6nUx82diZ8DYzH2JGSi5MniUobFtOgamUgwrXs6mk=; b=B/9eNof/nCt42b19fJdmMfIsHcXSoFb0X6TMaxjc3dBRVCiWUBK9qxFzJoGF3Ats6m WhIsMEk0T8xHbR6QgueeDAlGgWO7QUc2hpe7yg8z9nnndxUMDh3GNzaWHN/bK7KRypZg TTPM90Cf/w9uy3GzSPiGZQrH61bOSZzCDZ/PidxKFyey4VB14Znj0Mx8/Y9W6s7aVkNM X5p5nhkdZyncrIeN08o40CGTRRQg6bBSf/qe3kVMUysGnBhN6t42ZU70cgzV4DVri3tY 6lb49MmbNRMucMIPAQAluYFYQL+D+2aODVxsErYSqL+WYSPiK+xTcWaduG9ewCbZnAXL UpDQ== X-Gm-Message-State: ALoCoQngRr0lXZt2+N2WOOMWDhtUZkGbhsQS1/6cja06BG3u6FhZ+cbSDaokNe16qoNcKk8xrQ4S X-Received: by 10.152.43.47 with SMTP id t15mr2035284lal.38.1392380833762; Fri, 14 Feb 2014 04:27:13 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id qx7sm5727943lbb.9.2014.02.14.04.27.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Feb 2014 04:27:13 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Jaehoon Chung , devicetree@vger.kernel.org, Ulf Hansson Subject: [PATCH 1/3] mmc: core: Add DT bindings for SD card's UHS bus speed modes Date: Fri, 14 Feb 2014 13:27:07 +0100 Message-Id: <1392380829-8473-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Provide the option to configure these speed modes per host, for those host driver's that can't distinguish this in runtime. Signed-off-by: Ulf Hansson Acked-by: Jaehoon Chung --- Documentation/devicetree/bindings/mmc/mmc.txt | 5 +++++ drivers/mmc/core/host.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt index 458b57f..bd2ce67 100644 --- a/Documentation/devicetree/bindings/mmc/mmc.txt +++ b/Documentation/devicetree/bindings/mmc/mmc.txt @@ -26,6 +26,11 @@ Optional properties: this system, even if the controller claims it is. - cap-sd-highspeed: SD high-speed timing is supported - cap-mmc-highspeed: MMC high-speed timing is supported +- sd-uhs-sdr12: SD UHS SDR12 speed is supported +- sd-uhs-sdr25: SD UHS SDR25 speed is supported +- sd-uhs-sdr50: SD UHS SDR50 speed is supported +- sd-uhs-sdr104: SD UHS SDR104 speed is supported +- sd-uhs-ddr50: SD UHS DDR50 speed is supported - cap-power-off-card: powering off the card is safe - cap-sdio-irq: enable SDIO IRQ signalling on this interface - full-pwr-cycle: full power cycle of the card is supported diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 49bc403..2644d91 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -419,6 +419,16 @@ int mmc_of_parse(struct mmc_host *host) host->caps |= MMC_CAP_SD_HIGHSPEED; if (of_find_property(np, "cap-mmc-highspeed", &len)) host->caps |= MMC_CAP_MMC_HIGHSPEED; + if (of_find_property(np, "sd-uhs-sdr12", &len)) + host->caps |= MMC_CAP_UHS_SDR12; + if (of_find_property(np, "sd-uhs-sdr25", &len)) + host->caps |= MMC_CAP_UHS_SDR25; + if (of_find_property(np, "sd-uhs-sdr50", &len)) + host->caps |= MMC_CAP_UHS_SDR50; + if (of_find_property(np, "sd-uhs-sdr104", &len)) + host->caps |= MMC_CAP_UHS_SDR104; + if (of_find_property(np, "sd-uhs-ddr50", &len)) + host->caps |= MMC_CAP_UHS_DDR50; if (of_find_property(np, "cap-power-off-card", &len)) host->caps |= MMC_CAP_POWER_OFF_CARD; if (of_find_property(np, "cap-sdio-irq", &len))