ARM: OMAP: hsmmc: add max_freq field
External circuitry like level shifters may limit the maximum operation speed of the hsmmc controller. Add a field to struct omap2_hsmmc_info so boards can adjust the setting on demand. Signed-off-by: Daniel Mack <zonque@gmail.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
b81cfc4130
commit
d418ed87c4
3 changed files with 9 additions and 2 deletions
|
@ -316,6 +316,7 @@ static int omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
|
||||||
mmc->slots[0].pm_caps = c->pm_caps;
|
mmc->slots[0].pm_caps = c->pm_caps;
|
||||||
mmc->slots[0].internal_clock = !c->ext_clock;
|
mmc->slots[0].internal_clock = !c->ext_clock;
|
||||||
mmc->dma_mask = 0xffffffff;
|
mmc->dma_mask = 0xffffffff;
|
||||||
|
mmc->max_freq = c->max_freq;
|
||||||
if (cpu_is_omap44xx())
|
if (cpu_is_omap44xx())
|
||||||
mmc->reg_offset = OMAP4_MMC_REG_OFFSET;
|
mmc->reg_offset = OMAP4_MMC_REG_OFFSET;
|
||||||
else
|
else
|
||||||
|
|
|
@ -26,6 +26,8 @@ struct omap2_hsmmc_info {
|
||||||
char *name; /* or NULL for default */
|
char *name; /* or NULL for default */
|
||||||
struct device *dev; /* returned: pointer to mmc adapter */
|
struct device *dev; /* returned: pointer to mmc adapter */
|
||||||
int ocr_mask; /* temporary HACK */
|
int ocr_mask; /* temporary HACK */
|
||||||
|
int max_freq; /* maximum clock, if constrained by external
|
||||||
|
* circuitry, or 0 for default */
|
||||||
/* Remux (pad configuration) when powering on/off */
|
/* Remux (pad configuration) when powering on/off */
|
||||||
void (*remux)(struct device *dev, int slot, int power_on);
|
void (*remux)(struct device *dev, int slot, int power_on);
|
||||||
/* init some special card */
|
/* init some special card */
|
||||||
|
|
|
@ -1912,8 +1912,12 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
|
||||||
if (mmc_slot(host).vcc_aux_disable_is_sleep)
|
if (mmc_slot(host).vcc_aux_disable_is_sleep)
|
||||||
mmc_slot(host).no_off = 1;
|
mmc_slot(host).no_off = 1;
|
||||||
|
|
||||||
mmc->f_min = OMAP_MMC_MIN_CLOCK;
|
mmc->f_min = OMAP_MMC_MIN_CLOCK;
|
||||||
mmc->f_max = OMAP_MMC_MAX_CLOCK;
|
|
||||||
|
if (pdata->max_freq > 0)
|
||||||
|
mmc->f_max = pdata->max_freq;
|
||||||
|
else
|
||||||
|
mmc->f_max = OMAP_MMC_MAX_CLOCK;
|
||||||
|
|
||||||
spin_lock_init(&host->irq_lock);
|
spin_lock_init(&host->irq_lock);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue