Skip to contentSkip to conversation

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

PATCH In review Jaehoon Chung 1 participant 1 message Mar 6, 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 3/4 mmc: sdhci-s3c: use the sdhci-s3c.h instead of regs-sdhci.h

Using 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 9d31331..edf1cd2 100644
@@ -26,9 +26,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)

@@ -221,14 +221,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);