Hi Chris,
Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sdhci-s3c.c between commit bd0955ed6b1b ("mmc:
sdhci-s3c: add platform data for the second capability") from the s5p
tree and commit 7880741a0625 ("mmc: sdhci-s3c: derive transfer width host
capability from max_width in platform data") from the mmc tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell [email protected]
diff --cc drivers/mmc/host/sdhci-s3c.c
index b19e7d4,3bf509b..0000000
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@@ -518,6 -683,17 +683,14 @@@ static int __devinit sdhci_s3c_probe(st
if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT)
host->mmc->caps = MMC_CAP_NONREMOVABLE;
+ switch (pdata->max_width) {
+ case 8:
+ host->mmc->caps |= MMC_CAP_8_BIT_DATA;
+ case 4:
+ host->mmc->caps |= MMC_CAP_4_BIT_DATA;
+ break;
+ }
+
- if (pdata->host_caps)
- host->mmc->caps |= pdata->host_caps;
-
if (pdata->pm_caps)
host->mmc->pm_caps |= pdata->pm_caps;
Stephen Rothwell wrote:
>
> Hi Chris,
>
Hi Stephen,
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/sdhci-s3c.c between commit bd0955ed6b1b ("mmc:
> sdhci-s3c: add platform data for the second capability") from the s5p
> tree and commit 7880741a0625 ("mmc: sdhci-s3c: derive transfer width host
> capability from max_width in platform data") from the mmc tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Look ok to me, and let me carry following when it is required.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Hi,
I'm really disappointed with samsung sdhci merge. we sent several
patches, one month or two month ago. e.g., simple patch adding caps2
overrides feature.
To resolve these issue fianlly. can you move all mmc related things to
include/linux/platform_da
ta/ and controlled by mmc maintainer?
I hope no more dependency with arch codes and drivers codes.
Thank you,
Kyungmin Park
On 2/22/12, Kukjin Kim <[email protected]> wrote:
> Stephen Rothwell wrote:
>>
>> Hi Chris,
>>
> Hi Stephen,
>
>> Today's linux-next merge of the mmc tree got a conflict in
>> drivers/mmc/host/sdhci-s3c.c between commit bd0955ed6b1b ("mmc:
>> sdhci-s3c: add platform data for the second capability") from the s5p
>> tree and commit 7880741a0625 ("mmc: sdhci-s3c: derive transfer width host
>> capability from max_width in platform data") from the mmc tree.
>>
>> Just context changes. I fixed it up (see below) and can carry the fix as
>> necessary.
>
> Look ok to me, and let me carry following when it is required.
>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <[email protected]>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>