linux-next: manual merge of the mmc tree with the s5p tree

linux-next: manual merge of the mmc tree with the s5p tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sdhci-s3c.c between commit c1c4b66dc010 ("mmc:
sdhci-s3c: add platform data for the second capability") from the s5p
tree and commit 1c352c37ee23 ("mmc: sdhci-s3c: Enable runtime power
management") from the mmc tree.

Just context changes (I think).  I fixed it up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mmc/host/sdhci-s3c.c
index a2bfbe0,312aaf4..0000000
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@@ -714,9 -706,11 +703,14 @@@ static int __devinit sdhci_s3c_probe(st
  	if (pdata->host_caps)
  		host->mmc->caps |= pdata->host_caps;
  
 +	if (pdata->host_caps2)
 +		host->mmc->caps2 |= pdata->host_caps2;
 +
+ 	pm_runtime_enable(&pdev->dev);
+ 	pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
+ 	pm_runtime_use_autosuspend(&pdev->dev);
+ 	pm_suspend_ignore_children(&pdev->dev, 1);
+ 
  	ret = sdhci_add_host(host);
  	if (ret) {
  		dev_err(dev, "sdhci_add_host() failed\n");

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the mmc tree with the s5p tree

[Chris Ball]

Hi,

On Mon, Mar 26 2012, Stephen Rothwell wrote:
> This conflict has been caused in part because you rebased your tree and
> copied some commits that used to be merged into your tree from a shared
> branch.   Do *not* do that ... BTW, when you rebased those commits into
> your tree, you did not sign them either.  This is exactly what Linus has
> just berated one of the other maintainers for ...

Ugh, I'm sorry for screwing this up.

> I am not fixing this conflict, I am just using the version of your tree
> that I have from next-20120326.  Please fix your tree up properly.

I've reverted to the version in next-20120326 too, and will avoid rebasing.

Thanks,

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

linux-next: manual merge of the mmc tree with the s5p tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

Hi Chris,

This conflict has been caused in part because you rebased your tree and
copied some commits that used to be merged into your tree from a shared
branch.   Do *not* do that ... BTW, when you rebased those commits into
your tree, you did not sign them either.  This is exactly what Linus has
just berated one of the other maintainers for ...

I am not fixing this conflict, I am just using the version of your tree
that I have from next-20120326.  Please fix your tree up properly.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the mmc tree with the s5p tree

[Kyungmin Park]

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 <kgene.kim@samsung.com> 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 <kgene.kim@samsung.com>, 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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

RE: linux-next: manual merge of the mmc tree with the s5p tree

[Kukjin Kim]

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 <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

linux-next: manual merge of the mmc tree with the s5p tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]

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                    sfr@canb.auug.org.au

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;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]