From patchwork Wed Sep 26 11:38:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Liu X-Patchwork-Id: 1509251 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 43AB63FC71 for ; Wed, 26 Sep 2012 11:44:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755860Ab2IZLod (ORCPT ); Wed, 26 Sep 2012 07:44:33 -0400 Received: from na3sys009aog132.obsmtp.com ([74.125.149.250]:58557 "EHLO na3sys009aog132.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755064Ab2IZLob (ORCPT ); Wed, 26 Sep 2012 07:44:31 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob132.postini.com ([74.125.148.12]) with SMTP ID DSNKUGLqm9WiqXL/RVmxVyUBJpLupuPz52OB@postini.com; Wed, 26 Sep 2012 04:44:31 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 26 Sep 2012 04:44:03 -0700 Received: from localhost.localdomain (unknown [10.38.36.240]) by maili.marvell.com (Postfix) with ESMTP id 4857D4E510; Wed, 26 Sep 2012 04:44:02 -0700 (PDT) From: Kevin Liu To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu, ulf.hansson@linaro.org, zgao6@marvell.com Cc: hzhuang1@marvell.com, cxie4@marvell.com, prakity@marvell.com, kliu5@marvell.com, Bin Wang Subject: [PATCH v4 10/15] mmc: sdhci: introduce signal_voltage_switch callback function Date: Wed, 26 Sep 2012 19:38:42 +0800 Message-Id: <1348659527-4200-11-git-send-email-keyuan.liu@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1348659527-4200-1-git-send-email-keyuan.liu@gmail.com> References: <1348659527-4200-1-git-send-email-keyuan.liu@gmail.com> X-OriginalArrivalTime: 26 Sep 2012 11:44:03.0670 (UTC) FILETIME=[3A4ABF60:01CD9BDC] Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Kevin Liu Some soc/platform need specific handling for signal voltage switch. For example, mmp2/mmp3 need to set the AIB IO domain control register accordingly. Signed-off-by: Bin Wang Signed-off-by: Philip Rakity Signed-off-by: Kevin Liu --- drivers/mmc/host/sdhci.c | 17 +++++++++++++++++ drivers/mmc/host/sdhci.h | 1 + 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 49152fb..14ec904 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1684,6 +1684,15 @@ static int sdhci_do_3_3v_signal_voltage_switch(struct sdhci_host *host, return -EIO; } } + + /* + * May need to apply soc/platfrom settings for the + * voltage switch + */ + if (host->ops->signal_voltage_switch) + host->ops->signal_voltage_switch(host, + host->mmc->ios.signal_voltage); + /* Wait for 5ms */ usleep_range(5000, 5500); @@ -1726,6 +1735,14 @@ static int sdhci_do_1_8v_signal_voltage_switch(struct sdhci_host *host, ret = 0; if (!ret) { + /* + * May need to apply soc/platfrom settings for the + * voltage switch + */ + if (host->ops->signal_voltage_switch) + host->ops->signal_voltage_switch(host, + host->mmc->ios.signal_voltage); + ctrl |= SDHCI_CTRL_VDD_180; sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 5eb27bf..5f20d32 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -290,6 +290,7 @@ struct sdhci_ops { void (*hw_reset)(struct sdhci_host *host); void (*platform_suspend)(struct sdhci_host *host); void (*platform_resume)(struct sdhci_host *host); + void (*signal_voltage_switch)(struct sdhci_host *host, u8 vol); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS