aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/glamo/glamo-core.c2
-rw-r--r--drivers/mfd/glamo/glamo-core.h2
-rw-r--r--drivers/mfd/glamo/glamo-mci.c30
-rw-r--r--include/linux/glamofb.h2
4 files changed, 34 insertions, 2 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
index cb9b056169f..0e7a650d483 100644
--- a/drivers/mfd/glamo/glamo-core.c
+++ b/drivers/mfd/glamo/glamo-core.c
@@ -1116,6 +1116,8 @@ static int __init glamo_probe(struct platform_device *pdev)
/* bring MCI specific stuff over from our MFD platform data */
glamo_mci_def_pdata.glamo_set_mci_power =
glamo->pdata->glamo_set_mci_power;
+ glamo_mci_def_pdata.glamo_mci_use_slow =
+ glamo->pdata->glamo_mci_use_slow;
glamo_mci_def_pdata.glamo_irq_is_wired =
glamo->pdata->glamo_irq_is_wired;
glamo_mci_def_pdata.mci_suspending =
diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
index c89f8104fb1..dd6f67c3386 100644
--- a/drivers/mfd/glamo/glamo-core.h
+++ b/drivers/mfd/glamo/glamo-core.h
@@ -72,6 +72,8 @@ struct glamo_mci_pdata {
unsigned long ocr_avail;
void (*glamo_set_mci_power)(unsigned char power_mode,
unsigned short vdd);
+ /* glamo-mci asking if it should use the slow clock to card */
+ int (*glamo_mci_use_slow)(void);
int (*glamo_irq_is_wired)(void);
void (*mci_suspending)(struct platform_device *dev);
int (*mci_all_dependencies_resumed)(struct platform_device *dev);
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
index 7a2b060b3a7..d34632a8d18 100644
--- a/drivers/mfd/glamo/glamo-mci.c
+++ b/drivers/mfd/glamo/glamo-mci.c
@@ -57,6 +57,23 @@ static int sd_max_clk = 50000000 / 3;
module_param(sd_max_clk, int, 0644);
/*
+ * Slow SD clock rate
+ *
+ * you can override this on kernel commandline using
+ *
+ * glamo_mci.sd_slow_ratio=8
+ *
+ * for example
+ *
+ * platform callback is used to decide effective clock rate, if not
+ * defined then max is used, if defined and returns nonzero, rate is
+ * divided by this factor
+ */
+
+static int sd_slow_ratio = 8;
+module_param(sd_slow_ratio, int, 0644);
+
+/*
* SD Signal drive strength
*
* you can override this on kernel commandline using
@@ -554,8 +571,17 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
cmd->opcode, cmd->arg, cmd->data, cmd->mrq->stop,
cmd->flags);
- /* resume requested clock rate */
- __glamo_mci_fix_card_div(host, host->clk_div);
+ /* resume requested clock rate
+ * scale it down by sd_slow_ratio if platform requests it
+ */
+ if (host->pdata->glamo_mci_use_slow)
+ if ((host->pdata->glamo_mci_use_slow)())
+ __glamo_mci_fix_card_div(host, host->clk_div *
+ sd_slow_ratio);
+ else
+ __glamo_mci_fix_card_div(host, host->clk_div);
+ else
+ __glamo_mci_fix_card_div(host, host->clk_div);
if (glamo_mci_send_command(host, cmd))
goto bail;
diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
index bb1a398adf7..ca63355d43b 100644
--- a/include/linux/glamofb.h
+++ b/include/linux/glamofb.h
@@ -31,6 +31,8 @@ struct glamofb_platform_data {
/* glamo mmc platform specific info */
void (*glamo_set_mci_power)(unsigned char power_mode,
unsigned short vdd);
+ /* glamo-mci asking if it should use the slow clock to card */
+ int (*glamo_mci_use_slow)(void);
int (*glamo_irq_is_wired)(void);
void (*mci_suspending)(struct platform_device *dev);
int (*mci_all_dependencies_resumed)(struct platform_device *dev);