lkml.org 
[lkml]   [2020]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 7/9] mmc: mmci: add volt_switch callbacks
    Date
    A variant may need to define some actions before and after
    a voltage switch.

    This patch adds 2 voltage switch callbacks in mmci_host_ops:
    -pre_sig_volt_switch allows to prepare voltage switch before to
    sent the SD_SWITCH_VOLTAGE command (cmd11).
    -post_sig_volt_switch callback allows to define specific action after
    regulator set voltage.

    Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
    ---
    drivers/mmc/host/mmci.c | 8 ++++++++
    drivers/mmc/host/mmci.h | 2 ++
    2 files changed, 10 insertions(+)

    diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
    index d0a041c9e6cd..24e630183ed4 100644
    --- a/drivers/mmc/host/mmci.c
    +++ b/drivers/mmc/host/mmci.c
    @@ -22,6 +22,7 @@
    #include <linux/mmc/pm.h>
    #include <linux/mmc/host.h>
    #include <linux/mmc/card.h>
    +#include <linux/mmc/sd.h>
    #include <linux/mmc/slot-gpio.h>
    #include <linux/amba/bus.h>
    #include <linux/clk.h>
    @@ -1217,6 +1218,9 @@ mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c)
    writel_relaxed(clks, host->base + MMCIDATATIMER);
    }

    + if (host->ops->pre_sig_volt_switch && cmd->opcode == SD_SWITCH_VOLTAGE)
    + host->ops->pre_sig_volt_switch(host);
    +
    if (/*interrupt*/0)
    c |= MCI_CPSM_INTERRUPT;

    @@ -1830,6 +1834,7 @@ static int mmci_get_cd(struct mmc_host *mmc)

    static int mmci_sig_volt_switch(struct mmc_host *mmc, struct mmc_ios *ios)
    {
    + struct mmci_host *host = mmc_priv(mmc);
    int ret = 0;

    if (!IS_ERR(mmc->supply.vqmmc)) {
    @@ -1849,6 +1854,9 @@ static int mmci_sig_volt_switch(struct mmc_host *mmc, struct mmc_ios *ios)
    break;
    }

    + if (!ret && host->ops && host->ops->post_sig_volt_switch)
    + ret = host->ops->post_sig_volt_switch(host, ios);
    +
    if (ret)
    dev_warn(mmc_dev(mmc), "Voltage switch failed\n");
    }
    diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
    index ddcdfb827996..c3bc0a38d4cb 100644
    --- a/drivers/mmc/host/mmci.h
    +++ b/drivers/mmc/host/mmci.h
    @@ -377,6 +377,8 @@ struct mmci_host_ops {
    void (*set_clkreg)(struct mmci_host *host, unsigned int desired);
    void (*set_pwrreg)(struct mmci_host *host, unsigned int pwr);
    bool (*busy_complete)(struct mmci_host *host, u32 status, u32 err_msk);
    + void (*pre_sig_volt_switch)(struct mmci_host *host);
    + int (*post_sig_volt_switch)(struct mmci_host *host, struct mmc_ios *ios);
    };

    struct mmci_host {
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-01-28 10:07    [W:2.846 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site