From patchwork Tue Feb 14 17:01:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory CLEMENT X-Patchwork-Id: 9572267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BA41B60589 for ; Tue, 14 Feb 2017 17:02:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CA78283E1 for ; Tue, 14 Feb 2017 17:02:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9164428435; Tue, 14 Feb 2017 17:02:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D3C82842C for ; Tue, 14 Feb 2017 17:02:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932180AbdBNRCV (ORCPT ); Tue, 14 Feb 2017 12:02:21 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:52382 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753438AbdBNRCO (ORCPT ); Tue, 14 Feb 2017 12:02:14 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id 140382076B; Tue, 14 Feb 2017 18:02:12 +0100 (CET) Received: from localhost (83.146.29.93.rev.sfr.net [93.29.146.83]) by mail.free-electrons.com (Postfix) with ESMTPSA id D96662045B; Tue, 14 Feb 2017 18:02:01 +0100 (CET) From: Gregory CLEMENT To: Ulf Hansson , Adrian Hunter , linux-mmc@vger.kernel.org Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory CLEMENT , Thomas Petazzoni , linux-arm-kernel@lists.infradead.org, Mike Turquette , Stephen Boyd , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , devicetree@vger.kernel.org, Ziji Hu , Jimmy Xu , Jisheng Zhang , Nadav Haklai , Ryan Gao , Doug Jones , Victor Gu , "Wei(SOCP) Liu" , Wilson Ding , Yehuda Yitschak , Marcin Wojtas , Hanna Hawa , Kostya Porotchkin Subject: [PATCH v6 03/14] mmc: core: Add mmc-card dt sub-node parse in core layer Date: Tue, 14 Feb 2017 18:01:43 +0100 Message-Id: <34e51d32c82b57571e061e80df3bbaed731db554.1487091464.git-series.gregory.clement@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hu Ziji Some vendor host, like Xenon, can support multiple types. In dts, use mmc-card dt sub-node to indicate eMMC is in use. Add a generic mmc-card parse function in mmc core layer. If mmc-card sub-node is detected, set eMMC common caps, such as MMC_CAP_NONREMOVABLE, MMC_CAP2_NO_SD and MMC_CAP2_NO_SDIO. Since it is likely that struct mmc_card is not allocated yet when this mmc-card parse function is called, it will return true if mmc-card sub-node is detected. Otherwise, return false. It can help vendor host determine if the card type is eMMC. Signed-off-by: Hu Ziji Signed-off-by: Gregory CLEMENT --- drivers/mmc/core/mmc.c | 24 ++++++++++++++++++++++++ include/linux/mmc/core.h | 2 ++ 2 files changed, 26 insertions(+) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index b61b52f9da3d..dc480006a303 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -2111,6 +2111,30 @@ static const struct mmc_bus_ops mmc_ops = { }; /* + * Parse mmc-card dt sub-node and set eMMC common caps + * if mmc-card exists. + * If mmc-card is detected, return true. + * Otherwise, return false. + */ +bool mmc_of_parse_mmc_card(struct mmc_host *host) +{ + struct device_node *np; + bool ret = false; + + np = mmc_of_find_child_device(host, 0); + if (np && of_device_is_compatible(np, "mmc-card")) { + /* mmc-card sub-node indicates eMMC card is in use. */ + host->caps |= MMC_CAP_NONREMOVABLE; + host->caps2 |= MMC_CAP2_NO_SDIO | MMC_CAP2_NO_SD; + ret = true; + } + + of_node_put(np); + return ret; +} +EXPORT_SYMBOL_GPL(mmc_of_parse_mmc_card); + +/* * Starting point for MMC card init. */ int mmc_attach_mmc(struct mmc_host *host) diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index e33cc748dcfe..1b27323f3b6e 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -234,4 +234,6 @@ struct device_node; extern u32 mmc_vddrange_to_ocrmask(int vdd_min, int vdd_max); extern int mmc_of_parse_voltage(struct device_node *np, u32 *mask); +extern bool mmc_of_parse_mmc_card(struct mmc_host *host); + #endif /* LINUX_MMC_CORE_H */