From 691eb04ed2eb275e16fb5a203f1ea199434fd403 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Mon, 21 Jun 2010 17:56:07 +0900 Subject: [PATCH] s5p: mmc: codes clean up 1. rename function name from s5pc1xx to s5p 2. rename file name 3. clean up some codes and comment Signed-off-by: Minkyu Kang --- arch/arm/include/asm/arch-s5p64xx/mmc.h | 6 ++--- arch/arm/include/asm/arch-s5pc1xx/mmc.h | 6 ++--- board/samsung/p1p2/p1p2.c | 2 +- board/samsung/universal/universal.c | 2 +- drivers/mmc/Makefile | 2 +- drivers/mmc/{s5pc1xx_mmc.c => s5p_mmc.c} | 41 +++++++++++++++----------------- include/configs/s5pc1xx_p1p2.h | 2 +- include/configs/s5pc1xx_universal.h | 2 +- include/configs/smdk6442.h | 2 +- 9 files changed, 31 insertions(+), 34 deletions(-) rename drivers/mmc/{s5pc1xx_mmc.c => s5p_mmc.c} (91%) diff --git a/arch/arm/include/asm/arch-s5p64xx/mmc.h b/arch/arm/include/asm/arch-s5p64xx/mmc.h index 4efefba..3df8908 100644 --- a/arch/arm/include/asm/arch-s5p64xx/mmc.h +++ b/arch/arm/include/asm/arch-s5p64xx/mmc.h @@ -25,7 +25,7 @@ #define S5PC110_MMC_BASE 0xEB000000 #ifndef __ASSEMBLY__ -struct s5pc1xx_mmc { +struct s5p_mmc { unsigned long sysad; unsigned short blksize; unsigned short blkcnt; @@ -66,12 +66,12 @@ struct s5pc1xx_mmc { }; struct mmc_host { - struct s5pc1xx_mmc *reg; + struct s5p_mmc *reg; unsigned int version; /* SDHCI spec. version */ unsigned int clock; /* Current clock (MHz) */ }; -int s5pc1xx_mmc_init(int dev_index); +int s5p_mmc_init(int dev_index); #endif /* __ASSEMBLY__ */ #endif diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/include/asm/arch-s5pc1xx/mmc.h index 4efefba..3df8908 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/mmc.h +++ b/arch/arm/include/asm/arch-s5pc1xx/mmc.h @@ -25,7 +25,7 @@ #define S5PC110_MMC_BASE 0xEB000000 #ifndef __ASSEMBLY__ -struct s5pc1xx_mmc { +struct s5p_mmc { unsigned long sysad; unsigned short blksize; unsigned short blkcnt; @@ -66,12 +66,12 @@ struct s5pc1xx_mmc { }; struct mmc_host { - struct s5pc1xx_mmc *reg; + struct s5p_mmc *reg; unsigned int version; /* SDHCI spec. version */ unsigned int clock; /* Current clock (MHz) */ }; -int s5pc1xx_mmc_init(int dev_index); +int s5p_mmc_init(int dev_index); #endif /* __ASSEMBLY__ */ #endif diff --git a/board/samsung/p1p2/p1p2.c b/board/samsung/p1p2/p1p2.c index 5cf19d4..576f849 100644 --- a/board/samsung/p1p2/p1p2.c +++ b/board/samsung/p1p2/p1p2.c @@ -2183,7 +2183,7 @@ int board_mmc_init(bd_t *bis) gpio_set_drv(&s5pc110_gpio->gpio_g0, i, GPIO_DRV_4X); } - return s5pc1xx_mmc_init(0); + return s5p_mmc_init(0); } #endif diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c index 5d4f4f2..f048f90 100644 --- a/board/samsung/universal/universal.c +++ b/board/samsung/universal/universal.c @@ -2740,7 +2740,7 @@ int board_mmc_init(bd_t *bis) gpio_set_pull(&s5pc110_gpio->gpio_j2, 7, GPIO_PULL_NONE); } - return s5pc1xx_mmc_init(0); + return s5p_mmc_init(0); } #endif diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 022b6ef..8dfd8a3 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -32,7 +32,7 @@ COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o COBJS-$(CONFIG_MXC_MMC) += mxcmmc.o COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o -COBJS-$(CONFIG_S5PC1XX_MMC) += s5pc1xx_mmc.o +COBJS-$(CONFIG_S5P_MMC) += s5p_mmc.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/mmc/s5pc1xx_mmc.c b/drivers/mmc/s5p_mmc.c similarity index 91% rename from drivers/mmc/s5pc1xx_mmc.c rename to drivers/mmc/s5p_mmc.c index e939dfb..0e9690d 100644 --- a/drivers/mmc/s5pc1xx_mmc.c +++ b/drivers/mmc/s5p_mmc.c @@ -1,6 +1,7 @@ /* * (C) Copyright 2009 SAMSUNG Electronics * Minkyu Kang + * Jaehoon Chung * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,24 +23,24 @@ #include #include -#ifdef DEBUG_S3C_HSMMC +#ifdef DEBUG_S5P_HSMMC #define dbg(x...) printf(x) #else #define dbg(x...) do { } while (0) #endif -/* s5pc1xx support 4 mmc hosts */ +/* support 4 mmc hosts */ struct mmc mmc_dev[4]; struct mmc_host mmc_host[4]; -static inline struct s5pc1xx_mmc *s5pc1xx_get_base_mmc(int dev_index) +static inline struct s5p_mmc *s5p_get_base_mmc(int dev_index) { - unsigned long offset = dev_index * sizeof(struct s5pc1xx_mmc); + unsigned long offset = dev_index * sizeof(struct s5p_mmc); if (cpu_is_s5pc100()) - return (struct s5pc1xx_mmc *)(S5PC100_MMC_BASE + offset); + return (struct s5p_mmc *)(S5PC100_MMC_BASE + offset); else - return (struct s5pc1xx_mmc *)(S5PC110_MMC_BASE + offset); + return (struct s5p_mmc *)(S5PC110_MMC_BASE + offset); } static void mmc_prepare_data(struct mmc_host *host, struct mmc_data *data) @@ -97,7 +98,8 @@ static void mmc_set_transfer_mode(struct mmc_host *host, struct mmc_data *data) * TRNMOD * MUL1SIN0[5] : Multi/Single Block Select * RD1WT0[4] : Data Transfer Direction Select - * : 1 = read / 0 = write + * 1 = read + * 0 = write * ENACMD12[2] : Auto CMD12 Enable * ENBLKCNT[1] : Block Count Enable * ENDMA[0] : DMA Enable @@ -111,10 +113,6 @@ static void mmc_set_transfer_mode(struct mmc_host *host, struct mmc_data *data) writew(mode, &host->reg->trnmod); } -/* - * Sends a command out on the bus. Takes the mmc pointer, - * a command pointer, and an optional data pointer. - */ static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) { @@ -343,7 +341,6 @@ static void mmc_change_clock(struct mmc_host *host, uint clock) out: host->clock = clock; - return; } static void mmc_set_ios(struct mmc *mmc) @@ -373,11 +370,11 @@ static void mmc_set_ios(struct mmc *mmc) /* * FCSEL1[15] FCSEL0[7] * FCSel[1:0] : Rx Feedback Clock Delay Control - * Inverter delay means10ns delay if SDCLK 50MHz setting - * '01' = Delay1 (basic delay) - * '11' = Delay2 (basic delay + 2ns) - * '00' = Delay3 (inverter delay) - * '10' = Delay4 (inverter delay + 2ns) + * Inverter delay means10ns delay if SDCLK 50MHz setting + * 01 = Delay1 (basic delay) + * 11 = Delay2 (basic delay + 2ns) + * 00 = Delay3 (inverter delay) + * 10 = Delay4 (inverter delay + 2ns) */ writel(0x8080, &host->reg->control3); @@ -449,13 +446,13 @@ static int mmc_core_init(struct mmc *mmc) return 0; } -static int s5pc1xx_mmc_initialize(int dev_index) +static int s5p_mmc_initialize(int dev_index) { struct mmc *mmc; mmc = &mmc_dev[dev_index]; - sprintf(mmc->name, "S5PC1XX SD/MMC"); + sprintf(mmc->name, "SAMSUNG SD/MMC"); mmc->priv = &mmc_host[dev_index]; mmc->send_cmd = mmc_send_cmd; mmc->set_ios = mmc_set_ios; @@ -468,13 +465,13 @@ static int s5pc1xx_mmc_initialize(int dev_index) mmc->f_max = 52000000; mmc_host[dev_index].clock = 0; - mmc_host[dev_index].reg = s5pc1xx_get_base_mmc(dev_index); + mmc_host[dev_index].reg = s5p_get_base_mmc(dev_index); mmc_register(mmc); return 0; } -int s5pc1xx_mmc_init(int dev_index) +int s5p_mmc_init(int dev_index) { - return s5pc1xx_mmc_initialize(dev_index); + return s5p_mmc_initialize(dev_index); } diff --git a/include/configs/s5pc1xx_p1p2.h b/include/configs/s5pc1xx_p1p2.h index f0b02f4..a401358 100644 --- a/include/configs/s5pc1xx_p1p2.h +++ b/include/configs/s5pc1xx_p1p2.h @@ -82,7 +82,7 @@ /* MMC */ #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 -#define CONFIG_S5PC1XX_MMC 1 +#define CONFIG_S5P_MMC 1 #define CONFIG_MMC_INDEX 0 #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ diff --git a/include/configs/s5pc1xx_universal.h b/include/configs/s5pc1xx_universal.h index a7e809b..18f31c4 100644 --- a/include/configs/s5pc1xx_universal.h +++ b/include/configs/s5pc1xx_universal.h @@ -85,7 +85,7 @@ /* MMC */ #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 -#define CONFIG_S5PC1XX_MMC 1 +#define CONFIG_S5P_MMC 1 #define CONFIG_MMC_INDEX 0 #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ diff --git a/include/configs/smdk6442.h b/include/configs/smdk6442.h index d588e0e..f22be61 100644 --- a/include/configs/smdk6442.h +++ b/include/configs/smdk6442.h @@ -72,7 +72,7 @@ /* MMC */ #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 -#define CONFIG_S5PC1XX_MMC 1 +#define CONFIG_S5P_MMC 1 #define CONFIG_MMC_INDEX 0 #endif -- 2.7.4