* [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability
@ 2012-02-06 7:52 Jaehoon Chung
2012-02-06 11:19 ` Chris Ball
0 siblings, 1 reply; 6+ messages in thread
From: Jaehoon Chung @ 2012-02-06 7:52 UTC (permalink / raw)
To: linux-mmc
Cc: linux-samsung-soc, Chris Ball, Kyungmin Park, 'kgene kim',
Girish K S
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@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
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");
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability
2012-02-06 7:52 [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability Jaehoon Chung
@ 2012-02-06 11:19 ` Chris Ball
2012-02-06 23:41 ` Jaehoon Chung
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Chris Ball @ 2012-02-06 11:19 UTC (permalink / raw)
To: Jaehoon Chung
Cc: linux-mmc, linux-samsung-soc, Kyungmin Park, 'kgene kim',
Girish K S
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@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
> 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@laptop.org>
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability
2012-02-06 11:19 ` Chris Ball
@ 2012-02-06 23:41 ` Jaehoon Chung
2012-02-08 3:31 ` Huang Changming-R66093
2012-02-09 10:23 ` Kukjin Kim
2 siblings, 0 replies; 6+ messages in thread
From: Jaehoon Chung @ 2012-02-06 23:41 UTC (permalink / raw)
To: Chris Ball
Cc: Jaehoon Chung, linux-mmc, linux-samsung-soc, Kyungmin Park,
'kgene kim', Girish K S
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@samsung.com>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> ---
>> 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@laptop.org>
>
> - Chris.
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability
2012-02-06 11:19 ` Chris Ball
2012-02-06 23:41 ` Jaehoon Chung
@ 2012-02-08 3:31 ` Huang Changming-R66093
2012-02-08 3:39 ` Huang Changming-R66093
2012-02-09 10:23 ` Kukjin Kim
2 siblings, 1 reply; 6+ messages in thread
From: Huang Changming-R66093 @ 2012-02-08 3:31 UTC (permalink / raw)
To: Chris Ball, Jaehoon Chung
Cc: linux-mmc, linux-samsung-soc@vger.kernel.org, Kyungmin Park,
'kgene kim', Girish K S
Hi, Chris,
I have reworked it and send it to the maillist, please review it.
> -----Original Message-----
> From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc-
> owner@vger.kernel.org] On Behalf Of Chris Ball
> Sent: Monday, February 06, 2012 7:20 PM
> To: Jaehoon Chung
> Cc: linux-mmc; linux-samsung-soc@vger.kernel.org; Kyungmin Park; 'kgene
> kim'; Girish K S
> Subject: Re: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the
> second capability
>
> 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@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > ---
> > 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@laptop.org>
>
> - Chris.
> --
> Chris Ball <cjb@laptop.org> <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 majordomo@vger.kernel.org More majordomo info at
> http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability
2012-02-08 3:31 ` Huang Changming-R66093
@ 2012-02-08 3:39 ` Huang Changming-R66093
0 siblings, 0 replies; 6+ messages in thread
From: Huang Changming-R66093 @ 2012-02-08 3:39 UTC (permalink / raw)
To: Huang Changming-R66093, Chris Ball, Jaehoon Chung
Cc: linux-mmc, linux-samsung-soc@vger.kernel.org, Kyungmin Park,
'kgene kim', Girish K S
Sorry, please discard my previous reply.
> -----Original Message-----
> From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc-
> owner@vger.kernel.org] On Behalf Of Huang Changming-R66093
> Sent: Wednesday, February 08, 2012 11:32 AM
> To: Chris Ball; Jaehoon Chung
> Cc: linux-mmc; linux-samsung-soc@vger.kernel.org; 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.
>
>
> > -----Original Message-----
> > From: linux-mmc-owner@vger.kernel.org [mailto:linux-mmc-
> > owner@vger.kernel.org] On Behalf Of Chris Ball
> > Sent: Monday, February 06, 2012 7:20 PM
> > To: Jaehoon Chung
> > Cc: linux-mmc; linux-samsung-soc@vger.kernel.org; Kyungmin Park;
> > 'kgene kim'; Girish K S
> > Subject: Re: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the
> > second capability
> >
> > 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@samsung.com>
> > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > > ---
> > > 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@laptop.org>
> >
> > - Chris.
> > --
> > Chris Ball <cjb@laptop.org> <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 majordomo@vger.kernel.org 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 majordomo@vger.kernel.org More majordomo info at
> http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability
2012-02-06 11:19 ` Chris Ball
2012-02-06 23:41 ` Jaehoon Chung
2012-02-08 3:31 ` Huang Changming-R66093
@ 2012-02-09 10:23 ` Kukjin Kim
2 siblings, 0 replies; 6+ messages in thread
From: Kukjin Kim @ 2012-02-09 10:23 UTC (permalink / raw)
To: 'Chris Ball', 'Jaehoon Chung'
Cc: 'linux-mmc', linux-samsung-soc, 'Kyungmin Park',
'Girish K S'
Chris Ball wrote:
>
> Hi,
>
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@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > ---
> > 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@laptop.org>
>
OK, will apply this series with Chris' ack in samsung tree.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-09 10:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-06 7:52 [PATCH v3 2/2] mmc: sdhci-s3c: add platform data for the second capability Jaehoon Chung
2012-02-06 11:19 ` Chris Ball
2012-02-06 23:41 ` Jaehoon Chung
2012-02-08 3:31 ` Huang Changming-R66093
2012-02-08 3:39 ` Huang Changming-R66093
2012-02-09 10:23 ` Kukjin Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox