From patchwork Tue Sep 25 10:39:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Liu X-Patchwork-Id: 1503791 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 213C03FE65 for ; Tue, 25 Sep 2012 10:44:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755096Ab2IYKoy (ORCPT ); Tue, 25 Sep 2012 06:44:54 -0400 Received: from na3sys009aog129.obsmtp.com ([74.125.149.142]:53560 "EHLO na3sys009aog129.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755051Ab2IYKoy (ORCPT ); Tue, 25 Sep 2012 06:44:54 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob129.postini.com ([74.125.148.12]) with SMTP ID DSNKUGGLIQd7IoP4sPJk69mdi2f80g4Em4fC@postini.com; Tue, 25 Sep 2012 03:44:53 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 25 Sep 2012 03:44:29 -0700 Received: from localhost.localdomain (unknown [10.38.36.240]) by maili.marvell.com (Postfix) with ESMTP id 036FE4E510; Tue, 25 Sep 2012 03:44:27 -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 v3 11/11] mmc: sdhci-pxav3: add signal_voltage_switch function Date: Tue, 25 Sep 2012 18:39:06 +0800 Message-Id: <1348569546-13242-12-git-send-email-keyuan.liu@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1348569546-13242-1-git-send-email-keyuan.liu@gmail.com> References: <1348569546-13242-1-git-send-email-keyuan.liu@gmail.com> X-OriginalArrivalTime: 25 Sep 2012 10:44:29.0402 (UTC) FILETIME=[BD72FBA0:01CD9B0A] Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Kevin Liu Signed-off-by: Bin Wang Signed-off-by: Philip Rakity Signed-off-by: Kevin Liu --- drivers/mmc/host/sdhci-pxav3.c | 25 +++++++++++++++++++++++++ include/linux/platform_data/pxa_sdhci.h | 2 ++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 04db9f1..2746bb5 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -163,10 +163,35 @@ static int pxav3_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs) return 0; } +static void pxav3_signal_voltage_switch(struct sdhci_host *host, u8 vol) +{ + struct platform_device *pdev = to_platform_device(mmc_dev(host->mmc)); + struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data; + unsigned int set; + + switch (vol) { + case MMC_SIGNAL_VOLTAGE_330: + set = 3300000; + break; + case MMC_SIGNAL_VOLTAGE_180: + set = 1800000; + break; + case MMC_SIGNAL_VOLTAGE_120: + set = 1200000; + break; + default: + set = 3300000; + break; + } + if (pdata && pdata->signal_voltage_switch) + pdata->signal_voltage_switch(set); +} + static struct sdhci_ops pxav3_sdhci_ops = { .platform_reset_exit = pxav3_set_private_registers, .set_uhs_signaling = pxav3_set_uhs_signaling, .platform_send_init_74_clocks = pxav3_gen_init_74_clocks, + .signal_voltage_switch = pxav3_signal_voltage_switch, }; #ifdef CONFIG_OF diff --git a/include/linux/platform_data/pxa_sdhci.h b/include/linux/platform_data/pxa_sdhci.h index fdf38d6..3b94ab1 100644 --- a/include/linux/platform_data/pxa_sdhci.h +++ b/include/linux/platform_data/pxa_sdhci.h @@ -40,6 +40,7 @@ * @quirks: quirks of platfrom * @quirks2: quirks2 of platfrom * @pm_caps: pm_caps of platfrom + * @signal_voltage_switch: soc/platfrom handling needed for voltage switch */ struct sdhci_pxa_platdata { unsigned int flags; @@ -54,6 +55,7 @@ struct sdhci_pxa_platdata { unsigned int quirks; unsigned int quirks2; unsigned int pm_caps; + void (*signal_voltage_switch)(unsigned int set); }; struct sdhci_pxa {