From patchwork Wed Dec 12 13:13:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13504 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 7C61123E02 for ; Wed, 12 Dec 2012 13:14:14 +0000 (UTC) Received: from mail-ie0-f177.google.com (mail-ie0-f177.google.com [209.85.223.177]) by fiordland.canonical.com (Postfix) with ESMTP id 19FBBA19782 for ; Wed, 12 Dec 2012 13:14:14 +0000 (UTC) Received: by mail-ie0-f177.google.com with SMTP id k13so1768696iea.36 for ; Wed, 12 Dec 2012 05:14:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=RDRCcIx9bMzdh4mh63XkvCeR7bI/gzE+rO5IOyqClr4=; b=BC51YpLgMlQ4OAfEyIA7qozSq0PQD0uG72vYeRW/pUUqjFh3CB76ajG+C0rCPXR48L 2MwCGoNLICsGYBgk7gS3DnOFjrB7qQ7lMBzTEtxJb0w/HWrRqo80zZlODev+OyGeDVuY 5ld4KnamDmT4uyKRzISOwPY8AQ9ekNTlCkEWJzU2oLxfMhVNagDmdj5NKI+96gDzUnGM yT5J7kopT9EDff1fJP+L/vn3ILMrsq0zsKa0br4U/71rXqdUXDAwnWPEkxjIMp1Ebykm SHzNiXO/7DYYzxnu8d/6HT1AG0E/9tKwZI1cxXUVjs+8nTeo76ypVJVKhJS1A4PGwaeZ 4JAg== Received: by 10.50.91.195 with SMTP id cg3mr13222008igb.57.1355318053544; Wed, 12 Dec 2012 05:14:13 -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.50.67.148 with SMTP id n20csp198627igt; Wed, 12 Dec 2012 05:14:12 -0800 (PST) Received: by 10.14.208.137 with SMTP id q9mr2745797eeo.28.1355318052167; Wed, 12 Dec 2012 05:14:12 -0800 (PST) Received: from eu1sys200aog118.obsmtp.com (eu1sys200aog118.obsmtp.com [207.126.144.145]) by mx.google.com with SMTP id j7si59626766eeo.18.2012.12.12.05.14.05 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 05:14:12 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.145 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) client-ip=207.126.144.145; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.145 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-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob118.postini.com ([207.126.147.11]) with SMTP ID DSNKUMiDGG6t64tojQjnQnAmPecMZAquFOC2@postini.com; Wed, 12 Dec 2012 13:14:11 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 4DA7F11F; Wed, 12 Dec 2012 13:13:43 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id B164849A3; Wed, 12 Dec 2012 13:13:43 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id B6BB257C05B; Wed, 12 Dec 2012 14:13:36 +0100 (CET) Received: from steludxu1397.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 12 Dec 2012 14:13:42 +0100 From: Ulf Hansson To: , Chris Ball Cc: , Russell King , Linus Walleij , Ulf Hansson Subject: [PATCH] mmc: mmci: Support MMC_PM_KEEP_POWER Date: Wed, 12 Dec 2012 14:13:40 +0100 Message-ID: <1355318020-8169-1-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmJpx3YE7G/+pndLj1I/9lc++o7D1Nl/A/JQmXNQ52jy4zf63ltwGfoP5GAR8N71OpBbex3 From: Ulf Hansson 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index edc3e9b..2fe532e 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -1386,6 +1387,9 @@ static int __devinit mmci_probe(struct amba_device *dev, mmc->caps = plat->capabilities; mmc->caps2 = plat->capabilities2; + /* We support these PM capabilities. */ + mmc->pm_caps = MMC_PM_KEEP_POWER; + /* * We can do SGIO */