From patchwork Wed Nov 16 10:20:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sangwook X-Patchwork-Id: 5167 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 A074523E08 for ; Wed, 16 Nov 2011 10:22: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 866EEA183CB for ; Wed, 16 Nov 2011 10:22:59 +0000 (UTC) Received: by faaa26 with SMTP id a26so1847238faa.11 for ; Wed, 16 Nov 2011 02:22:59 -0800 (PST) Received: by 10.152.135.179 with SMTP id pt19mr19517294lab.47.1321438979247; Wed, 16 Nov 2011 02:22:59 -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.41.198 with SMTP id h6cs76962lal; Wed, 16 Nov 2011 02:22:58 -0800 (PST) Received: by 10.205.127.134 with SMTP id ha6mr28012910bkc.23.1321438976020; Wed, 16 Nov 2011 02:22:56 -0800 (PST) Received: from mail-bw0-f50.google.com (mail-bw0-f50.google.com [209.85.214.50]) by mx.google.com with ESMTPS id fq3si16515693bkc.101.2011.11.16.02.22.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Nov 2011 02:22:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of sangwook.lee@linaro.org) client-ip=209.85.214.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.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 bkbzu17 with SMTP id zu17so396105bkb.37 for ; Wed, 16 Nov 2011 02:22:54 -0800 (PST) Received: by 10.205.132.17 with SMTP id hs17mr27895509bkc.96.1321438974367; Wed, 16 Nov 2011 02:22:54 -0800 (PST) Received: from localhost.localdomain (host86-144-160-143.range86-144.btcentralplus.com. [86.144.160.143]) by mx.google.com with ESMTPS id i3sm20231719faf.0.2011.11.16.02.22.51 (version=SSLv3 cipher=OTHER); Wed, 16 Nov 2011 02:22:52 -0800 (PST) From: Sangwook Lee To: kgene.kim@samsung.com Cc: linux-samsung-soc@vger.kernel.org, patches@linaro.org, Sangwook Lee , Sangwook Lee Subject: [PATCH v2 1/2] ARM: SAMSUNG: Add pm_caps into platform data Date: Wed, 16 Nov 2011 10:20:48 +0000 Message-Id: <1321438848-3607-1-git-send-email-sangwook.lee@linaro.org> X-Mailer: git-send-email 1.7.4.1 Add pm_caps into platform_data. This is power management, usually for SDIO device such as SDIO WLAN. Signed-off-by: Sangwook Lee Acked-by: Thomas Abraham --- arch/arm/plat-samsung/include/plat/sdhci.h | 2 ++ arch/arm/plat-samsung/platformdata.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h index dcff7dd..fcd02d4 100644 --- a/arch/arm/plat-samsung/include/plat/sdhci.h +++ b/arch/arm/plat-samsung/include/plat/sdhci.h @@ -40,6 +40,7 @@ enum clk_types { * struct s3c_sdhci_platdata() - Platform device data for Samsung SDHCI * @max_width: The maximum number of data bits supported. * @host_caps: Standard MMC host capabilities bit field. + * @pm_caps: SDIO host PM capabilities bit field. * @cd_type: Type of Card Detection method (see cd_types enum above) * @clk_type: Type of clock divider method (see clk_types enum above) * @ext_cd_init: Initialize external card detect subsystem. Called on @@ -63,6 +64,7 @@ enum clk_types { struct s3c_sdhci_platdata { unsigned int max_width; unsigned int host_caps; + unsigned int pm_caps; enum cd_types cd_type; enum clk_types clk_type; diff --git a/arch/arm/plat-samsung/platformdata.c b/arch/arm/plat-samsung/platformdata.c index ceb9fa3..0f70718 100644 --- a/arch/arm/plat-samsung/platformdata.c +++ b/arch/arm/plat-samsung/platformdata.c @@ -53,6 +53,8 @@ void s3c_sdhci_set_platdata(struct s3c_sdhci_platdata *pd, set->cfg_gpio = pd->cfg_gpio; if (pd->host_caps) set->host_caps |= pd->host_caps; + if (pd->pm_caps) + set->pm_caps |= pd->pm_caps; if (pd->clk_type) set->clk_type = pd->clk_type; }