[PATCH] sdhci-s3c: fixed compiler error for renamed register

[PATCH] sdhci-s3c: fixed compiler error for renamed register

[Jaehoon Chung]

In Arindam Nath's patch "mmc:sd: add support for driver type selection"
included renamed SDHCI_HOST_CONTROL1.

In sdhci-s3c, we used SDHCI_HOST_CONTROL in sdhci_s3c_platform_8bit_width().
Also we need to use the renamed register in sdhci-s3c.c

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/mmc/host/sdhci-s3c.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 69e3ee3..15a6195 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -289,7 +289,7 @@ static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width)
 {
 	u8 ctrl;
 
-	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
+	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL1);
 
 	switch (width) {
 	case MMC_BUS_WIDTH_8:
@@ -304,7 +304,7 @@ static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width)
 		break;
 	}
 
-	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
+	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL1);
 
 	return 0;
 }

Re: [PATCH] sdhci-s3c: fixed compiler error for renamed register

[Chris Ball]

Hi,

On Wed, May 11 2011, Jaehoon Chung wrote:
> In Arindam Nath's patch "mmc:sd: add support for driver type selection"
> included renamed SDHCI_HOST_CONTROL1.
>
> In sdhci-s3c, we used SDHCI_HOST_CONTROL in sdhci_s3c_platform_8bit_width().
> Also we need to use the renamed register in sdhci-s3c.c
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  drivers/mmc/host/sdhci-s3c.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index 69e3ee3..15a6195 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -289,7 +289,7 @@ static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width)
>  {
>  	u8 ctrl;
>  
> -	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
> +	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL1);
>  
>  	switch (width) {
>  	case MMC_BUS_WIDTH_8:
> @@ -304,7 +304,7 @@ static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width)
>  		break;
>  	}
>  
> -	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
> +	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL1);
>  
>  	return 0;
>  }
>

Thanks, this affects other drivers too:

sdhci-esdhc-imx.c:      case SDHCI_HOST_CONTROL:
sdhci-of-esdhc.c:       if (reg == SDHCI_HOST_CONTROL)
sdhci-s3c.c:    ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
sdhci-s3c.c:    sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
sdhci-tegra.c:  ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
sdhci-tegra.c:  sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);

Arindam, is there any problem with continuing to use SDHCI_HOST_CONTROL
for the first register, and adding SDHCI_HOST_CONTROL2 for the second?
I think that would be better than modifying all of the drivers.

Thanks,

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

RE: [PATCH] sdhci-s3c: fixed compiler error for renamed register

[Nath, Arindam]

Hi Chris,


> -----Original Message-----
> From: Chris Ball [mailto:cjb@laptop.org]
> Sent: Wednesday, May 11, 2011 7:22 PM
> To: Jaehoon Chung
> Cc: linux-mmc@vger.kernel.org; Ben Dooks; Kyungmin Park; Nath, Arindam
> Subject: Re: [PATCH] sdhci-s3c: fixed compiler error for renamed
> register
> 
> Hi,
> 
> On Wed, May 11 2011, Jaehoon Chung wrote:
> > In Arindam Nath's patch "mmc:sd: add support for driver type
> selection"
> > included renamed SDHCI_HOST_CONTROL1.
> >
> > In sdhci-s3c, we used SDHCI_HOST_CONTROL in
> sdhci_s3c_platform_8bit_width().
> > Also we need to use the renamed register in sdhci-s3c.c
> >
> > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > ---
> >  drivers/mmc/host/sdhci-s3c.c |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-
> s3c.c
> > index 69e3ee3..15a6195 100644
> > --- a/drivers/mmc/host/sdhci-s3c.c
> > +++ b/drivers/mmc/host/sdhci-s3c.c
> > @@ -289,7 +289,7 @@ static int sdhci_s3c_platform_8bit_width(struct
> sdhci_host *host, int width)
> >  {
> >  	u8 ctrl;
> >
> > -	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
> > +	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL1);
> >
> >  	switch (width) {
> >  	case MMC_BUS_WIDTH_8:
> > @@ -304,7 +304,7 @@ static int sdhci_s3c_platform_8bit_width(struct
> sdhci_host *host, int width)
> >  		break;
> >  	}
> >
> > -	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
> > +	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL1);
> >
> >  	return 0;
> >  }
> >
> 
> Thanks, this affects other drivers too:
> 
> sdhci-esdhc-imx.c:      case SDHCI_HOST_CONTROL:
> sdhci-of-esdhc.c:       if (reg == SDHCI_HOST_CONTROL)
> sdhci-s3c.c:    ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
> sdhci-s3c.c:    sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
> sdhci-tegra.c:  ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
> sdhci-tegra.c:  sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
> 
> Arindam, is there any problem with continuing to use SDHCI_HOST_CONTROL
> for the first register, and adding SDHCI_HOST_CONTROL2 for the second?
> I think that would be better than modifying all of the drivers.

I am okay with your suggestion. I just changed the name as per the SDHC3.0 spec.

Thanks,
Arindam

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

Re: [PATCH] sdhci-s3c: fixed compiler error for renamed register

[Chris Ball]

Hi,

On Wed, May 11 2011, Nath, Arindam wrote:
> I am okay with your suggestion. I just changed the name as per the
> SDHC3.0 spec.

Great, okay.  I've rebased "mmc: sd: add support for driver type
selection" to remove that HOST_CONTROL->HOST_CONTROL1 change, and
pushed it out to mmc-next now.

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

Re: [PATCH] sdhci-s3c: fixed compiler error for renamed register

[Jaehoon Chung]

Thanks Chris..

Regards,
Jaehoon Chung

Chris Ball wrote:
> Hi,
> 
> On Wed, May 11 2011, Nath, Arindam wrote:
>> I am okay with your suggestion. I just changed the name as per the
>> SDHC3.0 spec.
> 
> Great, okay.  I've rebased "mmc: sd: add support for driver type
> selection" to remove that HOST_CONTROL->HOST_CONTROL1 change, and
> pushed it out to mmc-next now.
> 
> - Chris.