aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/host/mmci.c8
-rw-r--r--drivers/mmc/host/mmci.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index fd2e7acbed39..379af904bf6c 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -39,19 +39,23 @@ static unsigned int fmax = 515633;
39/** 39/**
40 * struct variant_data - MMCI variant-specific quirks 40 * struct variant_data - MMCI variant-specific quirks
41 * @clkreg: default value for MCICLOCK register 41 * @clkreg: default value for MCICLOCK register
42 * @clkreg_enable: enable value for MMCICLOCK register
42 */ 43 */
43struct variant_data { 44struct variant_data {
44 unsigned int clkreg; 45 unsigned int clkreg;
46 unsigned int clkreg_enable;
45}; 47};
46 48
47static struct variant_data variant_arm = { 49static struct variant_data variant_arm = {
48}; 50};
49 51
50static struct variant_data variant_u300 = { 52static struct variant_data variant_u300 = {
53 .clkreg_enable = 1 << 13, /* HWFCEN */
51}; 54};
52 55
53static struct variant_data variant_ux500 = { 56static struct variant_data variant_ux500 = {
54 .clkreg = MCI_CLK_ENABLE, 57 .clkreg = MCI_CLK_ENABLE,
58 .clkreg_enable = 1 << 14, /* HWFCEN */
55}; 59};
56/* 60/*
57 * This must be called with host->lock held 61 * This must be called with host->lock held
@@ -71,8 +75,8 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired)
71 clk = 255; 75 clk = 255;
72 host->cclk = host->mclk / (2 * (clk + 1)); 76 host->cclk = host->mclk / (2 * (clk + 1));
73 } 77 }
74 if (host->hw_designer == AMBA_VENDOR_ST) 78
75 clk |= MCI_ST_FCEN; /* Bug fix in ST IP block */ 79 clk |= variant->clkreg_enable;
76 clk |= MCI_CLK_ENABLE; 80 clk |= MCI_CLK_ENABLE;
77 /* This hasn't proven to be worthwhile */ 81 /* This hasn't proven to be worthwhile */
78 /* clk |= MCI_CLK_PWRSAVE; */ 82 /* clk |= MCI_CLK_PWRSAVE; */
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index b98cc782402a..68970cfb81e1 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -28,8 +28,6 @@
28#define MCI_4BIT_BUS (1 << 11) 28#define MCI_4BIT_BUS (1 << 11)
29/* 8bit wide buses supported in ST Micro versions */ 29/* 8bit wide buses supported in ST Micro versions */
30#define MCI_ST_8BIT_BUS (1 << 12) 30#define MCI_ST_8BIT_BUS (1 << 12)
31/* HW flow control on the ST Micro version */
32#define MCI_ST_FCEN (1 << 13)
33 31
34#define MMCIARGUMENT 0x008 32#define MMCIARGUMENT 0x008
35#define MMCICOMMAND 0x00c 33#define MMCICOMMAND 0x00c