From patchwork Mon Nov 7 17:05:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sangwook X-Patchwork-Id: 4949 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 7379E23E0E for ; Mon, 7 Nov 2011 17:07:38 +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 607A3A18618 for ; Mon, 7 Nov 2011 17:07:38 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so7576820faa.11 for ; Mon, 07 Nov 2011 09:07:38 -0800 (PST) Received: by 10.152.145.233 with SMTP id sx9mr6846061lab.6.1320685658231; Mon, 07 Nov 2011 09:07:38 -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.14.103 with SMTP id o7cs63681lac; Mon, 7 Nov 2011 09:07:37 -0800 (PST) Received: by 10.223.91.82 with SMTP id l18mr46355333fam.30.1320685657441; Mon, 07 Nov 2011 09:07:37 -0800 (PST) Received: from mail-fx0-f50.google.com (mail-fx0-f50.google.com [209.85.161.50]) by mx.google.com with ESMTPS id z23si9867076fam.49.2011.11.07.09.07.36 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 Nov 2011 09:07:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.161.50 is neither permitted nor denied by best guess record for domain of sangwook.lee@linaro.org) client-ip=209.85.161.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.161.50 is neither permitted nor denied by best guess record for domain of sangwook.lee@linaro.org) smtp.mail=sangwook.lee@linaro.org Received: by mail-fx0-f50.google.com with SMTP id r15so3266676faa.37 for ; Mon, 07 Nov 2011 09:07:36 -0800 (PST) Received: by 10.223.1.145 with SMTP id 17mr9459220faf.34.1320685656581; Mon, 07 Nov 2011 09:07:36 -0800 (PST) Received: from localhost.localdomain (host86-147-187-67.range86-147.btcentralplus.com. [86.147.187.67]) by mx.google.com with ESMTPS id d3sm19366270fad.2.2011.11.07.09.07.33 (version=SSLv3 cipher=OTHER); Mon, 07 Nov 2011 09:07:34 -0800 (PST) From: Sangwook Lee To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org Cc: cjb@laptop.org, kgene.kim@samsung.com, ben-linux@fluff.org, linaro-dev@lists.linaro.org, patches@linaro.org, Sangwook Lee , Sangwook Lee Subject: [PATCH 2/2] mmc: sdhci-s3c: Add pm_caps into SD/MMC host Date: Mon, 7 Nov 2011 17:05:22 +0000 Message-Id: <1320685522-17481-3-git-send-email-sangwook.lee@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1320685522-17481-1-git-send-email-sangwook.lee@linaro.org> References: <1320685522-17481-1-git-send-email-sangwook.lee@linaro.org> sdhci-s3c updates pm_caps from platform data for SDIO PM. Signed-off-by: Sangwook Lee Acked-by: Kukjin Kim --- drivers/mmc/host/sdhci-s3c.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index fe886d6..f10dd52 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -518,6 +518,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) if (pdata->host_caps) host->mmc->caps |= pdata->host_caps; + if (pdata->pm_caps) + host->mmc->pm_caps |= pdata->pm_caps; + host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR | SDHCI_QUIRK_32BIT_DMA_SIZE);