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 <jh80.chung@xxxxxxxxxxx>
>> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
>> ---
>> 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 <cjb@xxxxxxxxxx>
>
> - Chris.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
