From patchwork Thu Nov 10 16:23:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5033 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1E72723E06 for ; Thu, 10 Nov 2011 16:23:59 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 0B81CA18E86 for ; Thu, 10 Nov 2011 16:23:59 +0000 (UTC) Received: by faan26 with SMTP id n26so4311928faa.11 for ; Thu, 10 Nov 2011 08:23:58 -0800 (PST) Received: by 10.152.134.116 with SMTP id pj20mr4952588lab.5.1320942238535; Thu, 10 Nov 2011 08:23:58 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.40.7 with SMTP id t7cs12730lak; Thu, 10 Nov 2011 08:23:56 -0800 (PST) Received: by 10.213.27.200 with SMTP id j8mr647924ebc.144.1320942235183; Thu, 10 Nov 2011 08:23:55 -0800 (PST) Received: from eu1sys200aog108.obsmtp.com (eu1sys200aog108.obsmtp.com. [207.126.144.125]) by mx.google.com with SMTP id e1si2316368eec.147.2011.11.10.08.23.50 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Nov 2011 08:23:55 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.125 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) client-ip=207.126.144.125; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.125 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) smtp.mail=ulf.hansson@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob108.postini.com ([207.126.147.11]) with SMTP ID DSNKTrv6k3zHhGteBvtUycJgNau04T7yA8e9@postini.com; Thu, 10 Nov 2011 16:23:55 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 9B87C47; Thu, 10 Nov 2011 16:23:46 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 14DA94D; Thu, 10 Nov 2011 16:22:03 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 9FBF2A8065; Thu, 10 Nov 2011 17:23:39 +0100 (CET) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Thu, 10 Nov 2011 17:23:45 +0100 From: Ulf Hansson To: , Cc: Russell King , Ulf Hansson , Lee Jones Subject: [PATCH] mmc: mmci: Support MMC_PM_KEEP_POWER Date: Thu, 10 Nov 2011 17:23:42 +0100 Message-ID: <1320942222-3409-1-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.5.4 MIME-Version: 1.0 Add MMC_PM_KEEP_POWER to pm_caps so SDIO clients are able to use this option to prevent power off in suspend. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 50b5f99..1ac04a2 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1240,6 +1240,9 @@ static int __devinit mmci_probe(struct amba_device *dev, mmc->ocr_avail = plat->ocr_mask; mmc->caps = plat->capabilities; + /* We support these PM capabilities. */ + mmc->pm_caps = MMC_PM_KEEP_POWER; + /* * We can do SGIO */