lkml.org 
[lkml]   [2017]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 14/22] mmc: tmio,renesas_sdhi: move ssc_tappos to renesas_sdhi.h
    Date
    struct tmio_mmc_host has "scc_tappos", but in fact, it is Renesas
    private data. Move it to renesas_sdhi.h

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    ---

    Changes in v2:
    - Newly added

    drivers/mmc/host/renesas_sdhi.h | 1 +
    drivers/mmc/host/renesas_sdhi_core.c | 4 ++--
    drivers/mmc/host/tmio_mmc.h | 1 -
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/mmc/host/renesas_sdhi.h b/drivers/mmc/host/renesas_sdhi.h
    index 3250dbe..f13f798 100644
    --- a/drivers/mmc/host/renesas_sdhi.h
    +++ b/drivers/mmc/host/renesas_sdhi.h
    @@ -51,6 +51,7 @@ struct renesas_sdhi {
    struct pinctrl *pinctrl;
    struct pinctrl_state *pins_default, *pins_uhs;
    void __iomem *scc_ctl;
    + u32 scc_tappos;
    };

    #define host_to_priv(host) \
    diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
    index 34fd194..e78dca7 100644
    --- a/drivers/mmc/host/renesas_sdhi_core.c
    +++ b/drivers/mmc/host/renesas_sdhi_core.c
    @@ -267,7 +267,7 @@ static unsigned int renesas_sdhi_init_tuning(struct tmio_mmc_host *host)
    ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN &
    sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL));

    - sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF, host->scc_tappos);
    + sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_DT2FF, priv->scc_tappos);

    /* Read TAPNUM */
    return (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_DTCNTL) >>
    @@ -590,7 +590,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
    for (i = 0; i < of_data->taps_num; i++) {
    if (taps[i].clk_rate == 0 ||
    taps[i].clk_rate == host->mmc->f_max) {
    - host->scc_tappos = taps->tap;
    + priv->scc_tappos = taps->tap;
    hit = true;
    break;
    }
    diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
    index 8b169a0..9f083dc 100644
    --- a/drivers/mmc/host/tmio_mmc.h
    +++ b/drivers/mmc/host/tmio_mmc.h
    @@ -166,7 +166,6 @@ struct tmio_mmc_host {
    struct mutex ios_lock; /* protect set_ios() context */
    bool native_hotplug;
    bool sdio_irq_enabled;
    - u32 scc_tappos;

    /* Mandatory callback */
    int (*clk_enable)(struct tmio_mmc_host *host);
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-11-24 17:31    [W:4.376 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site