Skip to contentSkip to conversation

mmc: sdhci-s3c: add platform data for the second capability

PATCH In review Jaehoon Chung 4 participants 6 messages Feb 6, 2012 – Feb 9, 2012

Subsystems (4)
Arm Samsung Exynos MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver Secure digital host controller interface (SDHCI) Samsung driver
lore
Share & tools
lore

Jaehoon Chung

author maintainer
#0 lore raw

PATCH v3 2/2 mmc: sdhci-s3c: add platform data for the second capability

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 <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>

---
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(-)
drivers/mmc/host/sdhci-s3c.c +3 -3
index d065e37..46b9782 100644
@@ -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");
Signature · 1 line
1.7.4.1
Acked-by on v3 2/2
#1 lore raw

Hi,

Quoted 30 lines · Jaehoon Chung

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 <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>

---
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(-)
drivers/mmc/host/sdhci-s3c.c +0 -3
index d065e37..46b9782 100644
@@ -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;

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · line 552

Quoted 9 lines
drivers/mmc/host/sdhci-s3c.c +3 -0
@@ -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 <[email protected]>

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
author maintainer
#2 lore raw

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

Quoted 48 lines · Chris Ball

Hi,

Quoted 30 lines · Jaehoon Chung

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 <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>

---
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(-)
drivers/mmc/host/sdhci-s3c.c +0 -3
index d065e37..46b9782 100644
@@ -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;

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · line 552

Quoted 9 lines
drivers/mmc/host/sdhci-s3c.c +3 -0
@@ -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 <[email protected]>

- Chris.

#3 lore raw
In reply to Chris Ball

Hi, Chris,
I have reworked it and send it to the maillist, please review it.

Quoted 67 lines

-----Original Message-----
From: [email protected] [mailto:linux-mmc- [email protected]] On Behalf Of Chris Ball
Sent: Monday, February 06, 2012 7:20 PM
To: Jaehoon Chung
Cc: linux-mmc; [email protected]; Kyungmin Park; 'kgene kim'; Girish K S
Subject: Re: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability

Hi,

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct

Quoted 20 lines · Jaehoon Chung

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 <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>

---
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(-)
(quoted diff) +0 -0

b/drivers/mmc/host/sdhci-s3c.c index d065e37..46b9782 100644

drivers/mmc/host/sdhci-s3c.c +0 -0
@@ -521,9 +521,6 @@ static int __devinit sdhci_s3c_probe(struct

platform_device *pdev)

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct

Quoted 10 lines
drivers/mmc/host/sdhci-s3c.c +0 -3
 	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)

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · line 552

Quoted 9 lines
drivers/mmc/host/sdhci-s3c.c +3 -0
 	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 <[email protected]>

- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html

#4 lore raw

Sorry, please discard my previous reply.

Quoted 87 lines

-----Original Message-----
From: [email protected] [mailto:linux-mmc- [email protected]] On Behalf Of Huang Changming-R66093
Sent: Wednesday, February 08, 2012 11:32 AM
To: Chris Ball; Jaehoon Chung
Cc: linux-mmc; [email protected]; Kyungmin Park; 'kgene kim'; Girish K S
Subject: RE: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability

Hi, Chris,
I have reworked it and send it to the maillist, please review it.

Quoted 59 lines

-----Original Message-----
From: [email protected] [mailto:linux-mmc- [email protected]] On Behalf Of Chris Ball
Sent: Monday, February 06, 2012 7:20 PM
To: Jaehoon Chung
Cc: linux-mmc; [email protected]; Kyungmin Park; 'kgene kim'; Girish K S
Subject: Re: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability

Hi,

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct

Quoted 20 lines · Jaehoon Chung

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 <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>

---
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(-)
(quoted diff) +0 -0

b/drivers/mmc/host/sdhci-s3c.c index d065e37..46b9782 100644

drivers/mmc/host/sdhci-s3c.c +0 -0
@@ -521,9 +521,6 @@ static int __devinit sdhci_s3c_probe(struct

platform_device *pdev)

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct

Quoted 10 lines
drivers/mmc/host/sdhci-s3c.c +0 -3
 	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)

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · line 552

Quoted 9 lines
drivers/mmc/host/sdhci-s3c.c +3 -0
 	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 <[email protected]>
Quoted 8 lines

- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html

#5 lore raw
In reply to Chris Ball
Quoted 3 lines · Chris Ball

Hi,

Hi,

Quoted 45 lines · Jaehoon Chung

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct

Quoted 20 lines

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 <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>

---
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(-)
drivers/mmc/host/sdhci-s3c.c +0 -0
index d065e37..46b9782 100644
@@ -521,9 +521,6 @@ static int __devinit sdhci_s3c_probe(struct

platform_device *pdev)

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct

Quoted 10 lines
drivers/mmc/host/sdhci-s3c.c +0 -3
 	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)

drivers/mmc/host/sdhci-s3c.c static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · line 552

Quoted 9 lines
drivers/mmc/host/sdhci-s3c.c +3 -0
 	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:

Quoted 2 lines
Acked-by Chris Ball <[email protected]>

OK, will apply this series with Chris' ack in samsung tree.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.