From patchwork Tue Jan 20 08:05:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Yang X-Patchwork-Id: 5665841 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 98D56C058D for ; Tue, 20 Jan 2015 08:06:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB9D92026F for ; Tue, 20 Jan 2015 08:06:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDA7B2026D for ; Tue, 20 Jan 2015 08:06:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751543AbbATIGv (ORCPT ); Tue, 20 Jan 2015 03:06:51 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:49642 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751502AbbATIGu (ORCPT ); Tue, 20 Jan 2015 03:06:50 -0500 Received: by mail-pa0-f54.google.com with SMTP id eu11so9736711pac.13 for ; Tue, 20 Jan 2015 00:06:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bNjzpPCNMzlMmakxGtarLc5DfGmvcIAcHaDlOwm6Lg8=; b=xpZEtb6osDkxhqdzCiv5jLpnG4SwMHcwoLCSBr4f0FeO7JlU4JCFITH6Rq3fv6UAwG dmrVtg6VTOAGBCBITaW2navKX2bGwe2SwyF2w7YADHtR4n1ymkxEpg7ijHqUGDUXvaBZ o3VjDP2WApRr405m6ZhtKSnAecF8PYGT5pGjHaQY6RncNkcTxiILg9itjeRdDA6Yujfl j8RHqFGf8RK3DxFQorpKiAgew6TDK2eUHspK4uQ9yno6L7EMTKou+ZbguLcjygUee8G7 0QWd07+GsB0Oztw8F/qLoNpCZTX1mQDf1BUyTs3PVOaAsxw4EaR9/nk6WLCDj4RmORmm qsfA== X-Received: by 10.70.45.199 with SMTP id p7mr50935464pdm.32.1421741210121; Tue, 20 Jan 2015 00:06:50 -0800 (PST) Received: from localhost.localdomain ([124.219.7.128]) by mx.google.com with ESMTPSA id ud7sm2140869pbc.11.2015.01.20.00.06.46 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 00:06:49 -0800 (PST) From: Vincent Yang X-Google-Original-From: Vincent Yang To: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux@arm.linux.org.uk, chris@printf.net, ulf.hansson@linaro.org, andy.green@linaro.org, patches@linaro.org, jaswinder.singh@linaro.org, Vincent Yang Subject: [PATCH v5 1/4] mmc: sdhci: add a voltage switch callback function Date: Tue, 20 Jan 2015 16:05:15 +0800 Message-Id: <1421741118-18743-2-git-send-email-Vincent.Yang@tw.fujitsu.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1421741118-18743-1-git-send-email-Vincent.Yang@tw.fujitsu.com> References: <1421741118-18743-1-git-send-email-Vincent.Yang@tw.fujitsu.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 This patch adds a callback function to do controller-specific actions when switching voltages. It is a preparation and will be used by Fujitsu SDHCI controller f_sdh30 driver. Signed-off-by: Vincent Yang --- drivers/mmc/host/sdhci.c | 4 ++++ drivers/mmc/host/sdhci.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f1a488e..144b561 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1832,6 +1832,10 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, ctrl |= SDHCI_CTRL_VDD_180; sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); + /* Some controller need to do more when switching */ + if (host->ops->voltage_switch) + host->ops->voltage_switch(host); + /* 1.8V regulator output should be stable within 5 ms */ ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); if (ctrl & SDHCI_CTRL_VDD_180) diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 41a2c34..0315e18 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -339,6 +339,7 @@ struct sdhci_ops { void (*adma_workaround)(struct sdhci_host *host, u32 intmask); void (*platform_init)(struct sdhci_host *host); void (*card_event)(struct sdhci_host *host); + void (*voltage_switch)(struct sdhci_host *host); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS