lkml.org 
[lkml]   [2018]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/19] mmc: mmci: add variant property to write datactrl before command
    Date
    From: Ludovic Barre <ludovic.barre@st.com>

    This patch adds a boolean property to allow to write datactrl
    before to send command, whatever the command type (read or write).
    Needed to support the STM32 sdmmc variant.

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

    diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
    index 5fd3ffb6..83c3572 100644
    --- a/drivers/mmc/host/mmci.c
    +++ b/drivers/mmc/host/mmci.c
    @@ -855,7 +855,8 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
    mmci_request_end(host, host->mrq);
    } else if (sbc) {
    mmci_start_command(host, host->mrq->cmd, 0);
    - } else if (!(cmd->data->flags & MMC_DATA_READ)) {
    + } else if (!host->variant->datactrl_first &&
    + !(cmd->data->flags & MMC_DATA_READ)) {
    mmci_start_data(host, cmd->data);
    }
    }
    @@ -1119,7 +1120,8 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
    if (mrq->data)
    mmci_dma_get_next_data(host, mrq->data);

    - if (mrq->data && mrq->data->flags & MMC_DATA_READ)
    + if (mrq->data &&
    + (host->variant->datactrl_first || mrq->data->flags & MMC_DATA_READ))
    mmci_start_data(host, mrq->data);

    if (mrq->sbc)
    diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
    index b91b130..5091025 100644
    --- a/drivers/mmc/host/mmci.h
    +++ b/drivers/mmc/host/mmci.h
    @@ -259,6 +259,7 @@ struct mmci_host;
    * @datactrl_mask_sdio: SDIO enable mask in datactrl register
    * @datactrl_blksz: block size in power of two
    * @datactrl_dpsm_enable: enable value for DPSM
    + * @datactrl_first: true if data must be setup before send command
    * @pwrreg_powerup: power up value for MMCIPOWER register
    * @f_max: maximum clk frequency supported by the controller.
    * @signal_direction: input/out direction of bus signals can be indicated
    @@ -301,6 +302,7 @@ struct variant_data {
    unsigned int datactrl_mask_sdio;
    unsigned int datactrl_blocksz;
    unsigned int datactrl_dpsm_enable;
    + bool datactrl_first;
    bool st_sdio;
    bool st_clkdiv;
    bool blksz_datactrl16;
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-06-12 15:18    [W:4.079 / U:0.924 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site