mmc: s5p_mmc: fixed wrong function argument
Subsystems (3)
PATCH 2/3 mmc: s5p_mmc: fixed wrong function argument
Useless code is removed, and get buswidth value.
Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
--- arch/arm/include/asm/arch-exynos/mmc.h | 4 ++-- arch/arm/include/asm/arch-s5pc1xx/mmc.h | 4 ++-- drivers/mmc/s5p_sdhci.c | 9 ++++----- 3 files changed, 8 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch-exynos/mmc.h +2 -2
@@ -64,11 +64,11 @@#define SDHCI_CTRL4_DRIVE_MASK (_x) ((_x) << 16)#define SDHCI_CTRL4_DRIVE_SHIFT (16) -int s5p_sdhci_init (u32 regbase,u32 max_clk,u32 min_clk,u32 quirks); +int s5p_sdhci_init (u32 regbase,int index,int bus_width);static inline unsigned int s5p_mmc_init (int index,int bus_width) {unsigned int base =samsung_get_base_mmc () + (0x10000 * index); -return s5p_sdhci_init (base,52000000 ,400000 , index); +return s5p_sdhci_init (base, index, bus_width); }#endif
arch/arm/include/asm/arch-s5pc1xx/mmc.h +2 -2
@@ -64,11 +64,11 @@#define SDHCI_CTRL4_DRIVE_MASK (_x) ((_x) << 16)#define SDHCI_CTRL4_DRIVE_SHIFT (16) -int s5p_sdhci_init (u32 regbase,u32 max_clk,u32 min_clk,u32 quirks); +int s5p_sdhci_init (u32 regbase,int index,int bus_width);static inline unsigned int s5p_mmc_init (int index,int bus_width) {unsigned int base =samsung_get_base_mmc () + (0x10000 * index); -return s5p_sdhci_init (base,52000000 ,400000 , index); +return s5p_sdhci_init (base, index, bus_width); }#endif
drivers/mmc/s5p_sdhci.c +4 -5
@@ -69,7 +69,7 @@ static void s5p_sdhci_set_control_reg(struct sdhci_host *host)sdhci_writel (host, ctrl,SDHCI_CONTROL2 ); } -int s5p_sdhci_init (u32 regbase,u32 max_clk,u32 min_clk,u32 quirks) +int s5p_sdhci_init (u32 regbase,int index,int bus_width) {struct sdhci_host *host =NULL ; host = (struct sdhci_host *)malloc (sizeof (struct sdhci_host ));
@@ -80,12 +80,11 @@ int s5p_sdhci_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks) host->name =S5P_NAME ; host->ioaddr = (void *)regbase; - host->quirks = quirks; - host->quirks |=SDHCI_QUIRK_NO_HISPD_BIT |SDHCI_QUIRK_BROKEN_VOLTAGE | + host->quirks =SDHCI_QUIRK_NO_HISPD_BIT |SDHCI_QUIRK_BROKEN_VOLTAGE |SDHCI_QUIRK_BROKEN_R1B |SDHCI_QUIRK_32BIT_DMA_ADDR ; host->voltages =MMC_VDD_32_33 |MMC_VDD_33_34 |MMC_VDD_165_195 ; -if (quirks &SDHCI_QUIRK_REG32_RW ) +if (host->quirks &SDHCI_QUIRK_REG32_RW ) host->version =sdhci_readl (host,SDHCI_HOST_VERSION -2 ) >>16 ;else host->version =sdhci_readw (host,SDHCI_HOST_VERSION );
@@ -94,6 +93,6 @@ int s5p_sdhci_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks) host->host_caps =MMC_MODE_HC ; -add_sdhci (host, max_clk, min_clk); +add_sdhci (host,52000000 ,400000 );return 0 ; }
Signature · 1 line
1.7.4.1