sdhci-s3c: fixed compiler error for renamed register

PATCH In review Jaehoon Chung 3 participants 5 messages May 11, 2011 – May 12, 2011

Subsystems (3)

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

2011-05-11 15:41 UTC #0 lore raw

PATCH 1/1 sdhci-s3c: fixed compiler error for renamed register

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 <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
 drivers/mmc/host/sdhci-s3c.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/mmc/host/sdhci-s3c.c +2 -2

index 69e3ee3..15a6195 100644
@@ -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;
 }

Chris Ball

2011-05-11 15:45 UTC #1 lore raw

Hi,

Quoted 27 lines · 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 <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 drivers/mmc/host/sdhci-s3c.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-s3c.c +1 -1
index 69e3ee3..15a6195 100644
@@ -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:

drivers/mmc/host/sdhci-s3c.c static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width) · line 310

Quoted 8 lines

drivers/mmc/host/sdhci-s3c.c +1 -1

@@ -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.

Signature · 2 lines

Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child

Nath, Arindam

2011-05-11 15:38 UTC #2 lore raw

Hi Chris,

Quoted 61 lines

-----Original Message-----
From: Chris Ball [mailto:[email protected]]
Sent: Wednesday, May 11, 2011 7:22 PM
To: Jaehoon Chung
Cc: [email protected]; Ben Dooks; Kyungmin Park; Nath, Arindam
Subject: Re: [PATCH] sdhci-s3c: fixed compiler error for renamed register
Hi,
Quoted 1 line · Jaehoon Chung
In Arindam Nath's patch "mmc:sd: add support for driver type
selection"
Quoted 3 lines
included renamed SDHCI_HOST_CONTROL1.
In sdhci-s3c, we used SDHCI_HOST_CONTROL in
sdhci_s3c_platform_8bit_width().
drivers/mmc/host/sdhci-
Quoted 9 lines
Also we need to use the renamed register in sdhci-s3c.c
Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 drivers/mmc/host/sdhci-s3c.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci- renamed from drivers/mmc/host/sdhci-s3c.c +0 -0
s3c.c
drivers/mmc/host/sdhci-s3c.c static int sdhci_s3c_platform_8bit_width(struct
Quoted 4 lines
index 69e3ee3..15a6195 100644
drivers/mmc/host/sdhci-s3c.c +0 -0
@@ -289,7 +289,7 @@ static int sdhci_s3c_platform_8bit_width(struct
sdhci_host *host, int width)
drivers/mmc/host/sdhci-s3c.c static int sdhci_s3c_platform_8bit_width(struct
Quoted 9 lines
drivers/mmc/host/sdhci-s3c.c +1 -1
 {
 	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)
drivers/mmc/host/sdhci-s3c.c static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width) · line 310
Quoted 9 lines
drivers/mmc/host/sdhci-s3c.c +1 -1
 		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);

Quoted 3 lines

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

Quoted 7 lines

Thanks,
- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per Child

Chris Ball

2011-05-11 15:45 UTC #3 lore raw

Hi,

Quoted 2 lines · Arindam

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.

Signature · 2 lines

Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child

Jaehoon Chung

author maintainer

2011-05-12 02:26 UTC #4 lore raw

Thanks Chris..

Regards,
Jaehoon Chung

Quoted 11 lines · Chris Ball

Hi,
Quoted 2 lines · Arindam
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.