From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaehoon Chung Subject: Re: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability Date: Tue, 07 Feb 2012 08:41:26 +0900 Message-ID: <4F306526.4070606@samsung.com> References: <4F2F86DA.6030106@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-reply-to: Sender: linux-samsung-soc-owner@vger.kernel.org To: Chris Ball Cc: Jaehoon Chung , linux-mmc , linux-samsung-soc@vger.kernel.org, Kyungmin Park , 'kgene kim' , Girish K S List-Id: linux-mmc@vger.kernel.org Hi Kukjin.. I want to merge these patchset with Chris's ACK at Samsung-SoC tree Samsung-SoC need to set MMC_CAP2_BROKEN_VOLTAGE..So this patch is need. Best Regards, Jaehoon Chung On 02/06/2012 08:19 PM, Chris Ball wrote: > Hi, > > On Mon, Feb 06 2012, Jaehoon Chung wrote: >> This patch is added host_caps2 in sdhci-s3c.c >> It's necessary that use the second capabilities. >> And removed the duplicated host_caps. >> >> Signed-off-by: Jaehoon Chung >> Signed-off-by: Kyungmin Park >> --- >> Changelog v3: >> - based-on latest mmc-next tree >> Changelog v2: >> - remove the duplicated host_caps. >> >> drivers/mmc/host/sdhci-s3c.c | 6 +++--- >> 1 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c >> index d065e37..46b9782 100644 >> --- a/drivers/mmc/host/sdhci-s3c.c >> +++ b/drivers/mmc/host/sdhci-s3c.c >> @@ -521,9 +521,6 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) >> if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT) >> host->mmc->caps = MMC_CAP_NONREMOVABLE; >> >> - if (pdata->host_caps) >> - host->mmc->caps |= pdata->host_caps; >> - >> if (pdata->pm_caps) >> host->mmc->pm_caps |= pdata->pm_caps; >> >> @@ -547,6 +544,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) >> if (pdata->host_caps) >> host->mmc->caps |= pdata->host_caps; >> >> + if (pdata->host_caps2) >> + host->mmc->caps2 |= pdata->host_caps2; >> + >> ret = sdhci_add_host(host); >> if (ret) { >> dev_err(dev, "sdhci_add_host() failed\n"); > > In case you'd rather merge both of these via the samsung-soc tree: > > Acked-by: Chris Ball > > - Chris.