From patchwork Wed Jun 29 16:54:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Ferre X-Patchwork-Id: 929452 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5TFqhHA008776 for ; Wed, 29 Jun 2011 15:52:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756915Ab1F2PwY (ORCPT ); Wed, 29 Jun 2011 11:52:24 -0400 Received: from newsmtp5.atmel.com ([204.2.163.5]:17703 "EHLO sjogate2.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756687Ab1F2PwV (ORCPT ); Wed, 29 Jun 2011 11:52:21 -0400 Received: from meyreuil.atmel.fr ([10.159.254.132]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id p5TFho1M022814; Wed, 29 Jun 2011 08:43:51 -0700 (PDT) Received: from bendor.rfo.atmel.com ([10.159.245.201]) by meyreuil.atmel.fr (8.11.7p1+Sun/8.11.7) with ESMTP id p5TFksa09523; Wed, 29 Jun 2011 17:46:54 +0200 (MEST) From: Nicolas Ferre To: cjb@laptop.org, linux-mmc@vger.kernel.org, hans-christian.egtvedt@atmel.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@avr32linux.org, Nicolas Ferre , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Subject: [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci Date: Wed, 29 Jun 2011 18:54:19 +0200 Message-Id: <1ef60c032bc39531302c1603bfcb841d2d437ccc.1309366360.git.nicolas.ferre@atmel.com> X-Mailer: git-send-email 1.7.3 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 29 Jun 2011 15:52:43 +0000 (UTC) Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre Signed-off-by: Uwe Kleine-König --- drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..c414ebe 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) +{ + struct atmel_mci *host = platform_get_drvdata(pdev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot) + mmc_resume_host(host->slot[i]->mmc); + } + return ret; + } + } + + return 0; +} + +static int atmci_resume(struct platform_device *pdev) +{ + struct atmel_mci *host = platform_get_drvdata(pdev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_resume_host(slot->mmc); + if (ret < 0) + return ret; + } + + return 0; +} +#else +#define atmci_suspend NULL +#define atmci_resume NULL +#endif + + + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), + .suspend = atmci_suspend, + .resume = atmci_resume, .driver = { .name = "atmel_mci", },