| Message ID | 1435725525-4367-1-git-send-email-bjorn.andersson@sonymobile.com |
|---|---|
| State | Needs Review / ACK, archived |
| Headers | show |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 1 errors, 0 warnings, 0 lines checked |
| robh/patch-applied | success |
On Tue, Jun 30, 2015 at 09:38:45PM -0700, Bjorn Andersson wrote: > +- vmmc-load: requested load for the vmmc regulator, in mA > +- vqmmc-load: requested load for the vqmmc regulator, in mA Isn't this something that should have default values from the spec? The binding also ought to say what a "requested load" is.
On Wed 01 Jul 03:59 PDT 2015, Mark Brown wrote: > On Tue, Jun 30, 2015 at 09:38:45PM -0700, Bjorn Andersson wrote: > > > +- vmmc-load: requested load for the vmmc regulator, in mA > > +- vqmmc-load: requested load for the vqmmc regulator, in mA > > Isn't this something that should have default values from the spec? The > binding also ought to say what a "requested load" is. It sounds reasonable that these values should simply come from the card specification; I don't know if there's any sane way for us to list them though (other than just stating them in dt). I'll have to do some more investigation on the subject... And I get your point that it's not "requested load", it's the power requirements of the card...so it should be rephrased. Thanks, Bjorn -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt index 0384fc3f64e8..05c8b4f59187 100644 --- a/Documentation/devicetree/bindings/mmc/mmc.txt +++ b/Documentation/devicetree/bindings/mmc/mmc.txt @@ -47,6 +47,8 @@ Optional properties: - mmc-hs400-1_2v: eMMC HS400 mode(1.2V I/O) is supported - dsr: Value the card's (optional) Driver Stage Register (DSR) should be programmed with. Valid range: [0 .. 0xffff]. +- vmmc-load: requested load for the vmmc regulator, in mA +- vqmmc-load: requested load for the vqmmc regulator, in mA *NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line polarity properties, we have to fix the meaning of the "normal" and "inverted" diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 9ad73f30f744..0a8f828af59f 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1455,12 +1455,18 @@ int mmc_regulator_get_supply(struct mmc_host *mmc) mmc->ocr_avail = ret; else dev_warn(dev, "Failed getting OCR mask: %d\n", ret); + + if (mmc->supply.vmmc_load) + regulator_set_load(mmc->supply.vmmc, mmc->supply.vmmc_load); } if (IS_ERR(mmc->supply.vqmmc)) { if (PTR_ERR(mmc->supply.vqmmc) == -EPROBE_DEFER) return -EPROBE_DEFER; dev_info(dev, "No vqmmc regulator found\n"); + } else { + if (mmc->supply.vqmmc_load) + regulator_set_load(mmc->supply.vqmmc, mmc->supply.vqmmc_load); } return 0; diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 99a9c9011c50..136af25bef9d 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -475,6 +475,10 @@ int mmc_of_parse(struct mmc_host *host) host->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH; } + /* Parse regulator load requests */ + of_property_read_u32(np, "vmmc-load", &host->supply.vmmc_load); + of_property_read_u32(np, "vqmmc-load", &host->supply.vqmmc_load); + /* Parse Write Protection */ ro_cap_invert = of_property_read_bool(np, "wp-inverted"); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 1369e54faeb7..e4e2a26bab41 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -197,6 +197,8 @@ struct mmc_pwrseq; struct mmc_supply { struct regulator *vmmc; /* Card power supply */ struct regulator *vqmmc; /* Optional Vccq supply */ + u32 vmmc_load; /* Load request for vmmc */ + u32 vqmmc_load; /* Load request for vqmmc */ }; struct mmc_host {
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> --- This is needed to get our regulators into hpm, to give enough power to our sdhci cards to run at higher clockrates - e.g. hs200. Documentation/devicetree/bindings/mmc/mmc.txt | 2 ++ drivers/mmc/core/core.c | 6 ++++++ drivers/mmc/core/host.c | 4 ++++ include/linux/mmc/host.h | 2 ++ 4 files changed, 14 insertions(+)