Add pm_caps into platform data and update it in SD/MMC driver This field can be used with SDIO device such as SDIO WLAN.
Sangwook Lee (2): ARM: SAMSUNG: Add pm_caps into platform data mmc: sdhci-s3c: Add pm_caps into SD/MMC host
arch/arm/plat-samsung/dev-hsmmc3.c | 2 ++ arch/arm/plat-samsung/include/plat/sdhci.h | 2 ++ drivers/mmc/host/sdhci-s3c.c | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-)
Add pm_caps into platform_data. This is power management, usually for SDIO device such as SDIO WLAN.
Signed-off-by: Sangwook Lee sangwook.lee@samsung.com --- arch/arm/plat-samsung/dev-hsmmc3.c | 2 ++ arch/arm/plat-samsung/include/plat/sdhci.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-samsung/dev-hsmmc3.c b/arch/arm/plat-samsung/dev-hsmmc3.c index ede776f..8f467f2 100644 --- a/arch/arm/plat-samsung/dev-hsmmc3.c +++ b/arch/arm/plat-samsung/dev-hsmmc3.c @@ -78,6 +78,8 @@ void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd) set->cfg_card = pd->cfg_card; 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; } diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h index 058e096..35646de 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 @@ -67,6 +68,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;
Sangwook Lee wrote:
Add pm_caps into platform_data. This is power management, usually for SDIO device such as SDIO WLAN.
Signed-off-by: Sangwook Lee sangwook.lee@samsung.com
arch/arm/plat-samsung/dev-hsmmc3.c | 2 ++ arch/arm/plat-samsung/include/plat/sdhci.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-samsung/dev-hsmmc3.c
b/arch/arm/plat-samsung/dev-
hsmmc3.c index ede776f..8f467f2 100644 --- a/arch/arm/plat-samsung/dev-hsmmc3.c +++ b/arch/arm/plat-samsung/dev-hsmmc3.c @@ -78,6 +78,8 @@ void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata
*pd)
set->cfg_card = pd->cfg_card;if (pd->host_caps) set->host_caps |= pd->host_caps;
- if (pd->pm_caps)
set->pm_caps |= pd->pm_caps;} diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat- samsung/include/plat/sdhci.h index 058e096..35646de 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
@@ -67,6 +68,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;
-- 1.7.4.1
Hi Sangwook,
I think you need to re-work based on latest my for-next.
Thanks.
Best regards, Kgene. -- Kukjin Kim kgene.kim@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Hi
On 15 November 2011 09:53, Kukjin Kim kgene.kim@samsung.com wrote:
Sangwook Lee wrote:
Add pm_caps into platform_data. This is power management, usually for SDIO device such as SDIO WLAN.
Signed-off-by: Sangwook Lee sangwook.lee@samsung.com
arch/arm/plat-samsung/dev-hsmmc3.c | 2 ++ arch/arm/plat-samsung/include/plat/sdhci.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-samsung/dev-hsmmc3.c
b/arch/arm/plat-samsung/dev-
hsmmc3.c index ede776f..8f467f2 100644 --- a/arch/arm/plat-samsung/dev-hsmmc3.c +++ b/arch/arm/plat-samsung/dev-hsmmc3.c @@ -78,6 +78,8 @@ void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata
*pd)
set->cfg_card = pd->cfg_card; 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;} diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat- samsung/include/plat/sdhci.h index 058e096..35646de 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
@@ -67,6 +68,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;-- 1.7.4.1
Hi Sangwook,
I think you need to re-work based on latest my for-next.
Ok, I will rebase and then it again
Thanks.
Best regards, Kgene. -- Kukjin Kim kgene.kim@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
sdhci-s3c updates pm_caps from platform data for SDIO PM.
Signed-off-by: Sangwook Lee sangwook.lee@samsung.com --- 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);
Sangwook Lee wrote:
sdhci-s3c updates pm_caps from platform data for SDIO PM.
Signed-off-by: Sangwook Lee sangwook.lee@samsung.com
Acked-by: Kukjin Kim kgene.kim@samsung.com
Hi Chris,
Could you please pick this up in your tree for v3.3?
Thanks.
Best regards, Kgene. -- Kukjin Kim kgene.kim@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
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);
-- 1.7.4.1
-
Kukjin Kim -
Sangwook Lee