From patchwork Tue Jan 27 23:35:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 5721421 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 217E29FB44 for ; Tue, 27 Jan 2015 23:37:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A94A2024F for ; Tue, 27 Jan 2015 23:37:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 623AF20259 for ; Tue, 27 Jan 2015 23:37:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759370AbbA0Xgc (ORCPT ); Tue, 27 Jan 2015 18:36:32 -0500 Received: from cantor2.suse.de ([195.135.220.15]:50818 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754554AbbA0Xga (ORCPT ); Tue, 27 Jan 2015 18:36:30 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 07BB8AC07; Tue, 27 Jan 2015 23:36:28 +0000 (UTC) From: NeilBrown To: Tony Lindgren , Ulf Hansson Date: Wed, 28 Jan 2015 10:35:24 +1100 Subject: [PATCH 2/3] mmc: core: export functions for setting bus width. Cc: Andreas Fenkart , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, GTA04 owners , NeilBrown , linux-omap@vger.kernel.org Message-ID: <20150127233524.32160.48364.stgit@notabene.brown> In-Reply-To: <20150127233118.32160.11899.stgit@notabene.brown> References: <20150127233118.32160.11899.stgit@notabene.brown> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 It is not safe for a host to turn off clocks while expecting an SD card interrupt unless it first places the bus in 1-bit mode. To allow hosts to do this, export functions necessary for changing bus width. Signed-off-by: NeilBrown --- drivers/mmc/core/core.c | 1 + drivers/mmc/core/sdio.c | 8 ++++---- include/linux/mmc/host.h | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 7162ada24a24..418dd8ec36f8 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1099,6 +1099,7 @@ void mmc_set_bus_width(struct mmc_host *host, unsigned int width) mmc_set_ios(host); mmc_host_clk_release(host); } +EXPORT_SYMBOL(mmc_set_bus_width); /* * Set initial state after a power cycle or a hw_reset. diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index fd0750b5a634..128bbf10ae98 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -257,7 +257,7 @@ static int sdio_disable_cd(struct mmc_card *card) * Devices that remain active during a system suspend are * put back into 1-bit mode. */ -static int sdio_disable_wide(struct mmc_card *card) +int sdio_disable_wide(struct mmc_card *card) { int ret; u8 ctrl; @@ -286,9 +286,9 @@ static int sdio_disable_wide(struct mmc_card *card) return 0; } +EXPORT_SYMBOL(sdio_disable_wide); - -static int sdio_enable_4bit_bus(struct mmc_card *card) +int sdio_enable_4bit_bus(struct mmc_card *card) { int err; @@ -309,7 +309,7 @@ static int sdio_enable_4bit_bus(struct mmc_card *card) return err; } - +EXPORT_SYMBOL(sdio_enable_4bit_bus); /* * Test if the card supports high-speed mode and, if so, switch to it. diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index b6bf718c3498..822a02528c91 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -517,4 +517,8 @@ static inline bool mmc_card_hs400(struct mmc_card *card) return card->host->ios.timing == MMC_TIMING_MMC_HS400; } +int sdio_disable_wide(struct mmc_card *card); +int sdio_enable_4bit_bus(struct mmc_card *card); +void mmc_set_bus_width(struct mmc_host *host, unsigned int width); + #endif /* LINUX_MMC_HOST_H */