Skip to contentSkip to conversation

mmc: sdhci-s3c: use the sdhci-s3c.h instead of regs-sdhci.h

PATCH Superseded Jaehoon Chung 3 participants 3 messages Feb 14, 2012 – Feb 16, 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

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Jaehoon Chung

author maintainer
#0 lore raw

PATCH 3/4 mmc: sdhci-s3c: use the sdhci-s3c.h instead of regs-sdhci.h

Use the sdhci-s3c.h

Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 drivers/mmc/host/sdhci-s3c.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
drivers/mmc/host/sdhci-s3c.c +5 -7
index a651c1e..ac4b0e8 100644
@@ -24,9 +24,9 @@
 #include <linux/mmc/host.h>
 
 #include <plat/sdhci.h>
-#include <plat/regs-sdhci.h>
 
 #include "sdhci-pltfm.h"
+#include "sdhci-s3c.h"
 #include "sdhci.h"
 
 #define MAX_BUS_CLK	(4)

@@ -200,14 +200,12 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock)
 	}
 
 	/* reprogram default hardware configuration */
-	writel(S3C64XX_SDHCI_CONTROL4_DRIVE_9mA,
-		host->ioaddr + S3C64XX_SDHCI_CONTROL4);
+	writel(S3C_SDHCI_CONTROL4_DRIVE_9mA,
+		host->ioaddr + S3C_SDHCI_CONTROL4);
 
 	ctrl = readl(host->ioaddr + S3C_SDHCI_CONTROL2);
-	ctrl |= (S3C64XX_SDHCI_CTRL2_ENSTAASYNCCLR |
-		  S3C64XX_SDHCI_CTRL2_ENCMDCNFMSK |
-		  S3C_SDHCI_CTRL2_ENFBCLKRX |
-		  S3C_SDHCI_CTRL2_DFCNT_NONE |
+	ctrl |= (S3C_SDHCI_CTRL2_ENSTAASYNCCLR | S3C_SDHCI_CTRL2_ENCMDCNFMSK |
+		  S3C_SDHCI_CTRL2_ENFBCLKRX | S3C_SDHCI_CTRL2_DFCNT_NONE |
 		  S3C_SDHCI_CTRL2_ENCLKOUTHOLD);
 	writel(ctrl, host->ioaddr + S3C_SDHCI_CONTROL2);
#1 lore raw
Quoted 2 lines · Jaehoon Chung

Use the sdhci-s3c.h

This patch should be merged into 2nd patch which is including change the name to S3C_SDHCI_xxx from S3C64Xx_SDHCI_xxx. BTW, I'm not sure the name should/can be changed because as you know S3C64XX_ means this can be used after S3C64XX or just for S3C64XX, so need to check data sheet of SDHCI part for S3C24XX and S3C64XX and later.

Thanks.

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

#2 lore raw

2012/2/16 Kukjin Kim <[email protected]>:

Quoted 9 lines · Jaehoon Chung
Quoted 3 lines

Use the sdhci-s3c.h

This patch should be merged into 2nd patch which is including change the name to S3C_SDHCI_xxx from S3C64Xx_SDHCI_xxx. BTW, I'm not sure the name should/can be changed because as you know S3C64XX_ means this can be used after S3C64XX or just for S3C64XX, so need to check data sheet of SDHCI part for S3C24XX and S3C64XX and later.

Hi Mr. Kukjin.

I know that use only S3C64XX_ or S3C24XX.
But i think no problem that change to S3C_SDHCI_xxx form S3C64XX_SDHCI_xxx. Because now that's meaningless...Though use the S3C64XX_SDHCI_xxx or S3C24xxx_, finally that also use in sdhci-s3c.c.

What means that distinguish between S3C_SDHCI and S3C64xx_SDHCI?

Best Regards,
Jaehoon Chung

Quoted 13 lines

Thanks.

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

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