mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
ARM: 7725/1: mmc: mmci: Cache MMCIDATACTRL register
Add a cache variable in the host struct that reflects the current data in the MMCIDATACTRL register. This patch will not introduce any functional change but instead provide an easy option to keep specific bits in the register between each data transfer. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
0f3ed7f75c
commit
9cc639a20f
2 changed files with 15 additions and 3 deletions
|
@ -188,6 +188,17 @@ static void mmci_write_pwrreg(struct mmci_host *host, u32 pwr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This must be called with host->lock held
|
||||||
|
*/
|
||||||
|
static void mmci_write_datactrlreg(struct mmci_host *host, u32 datactrl)
|
||||||
|
{
|
||||||
|
if (host->datactrl_reg != datactrl) {
|
||||||
|
host->datactrl_reg = datactrl;
|
||||||
|
writel(datactrl, host->base + MMCIDATACTRL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This must be called with host->lock held
|
* This must be called with host->lock held
|
||||||
*/
|
*/
|
||||||
|
@ -281,7 +292,7 @@ static void mmci_set_mask1(struct mmci_host *host, unsigned int mask)
|
||||||
|
|
||||||
static void mmci_stop_data(struct mmci_host *host)
|
static void mmci_stop_data(struct mmci_host *host)
|
||||||
{
|
{
|
||||||
writel(0, host->base + MMCIDATACTRL);
|
mmci_write_datactrlreg(host, 0);
|
||||||
mmci_set_mask1(host, 0);
|
mmci_set_mask1(host, 0);
|
||||||
host->data = NULL;
|
host->data = NULL;
|
||||||
}
|
}
|
||||||
|
@ -559,7 +570,7 @@ static int mmci_dma_start_data(struct mmci_host *host, unsigned int datactrl)
|
||||||
datactrl |= MCI_DPSM_DMAENABLE;
|
datactrl |= MCI_DPSM_DMAENABLE;
|
||||||
|
|
||||||
/* Trigger the DMA transfer */
|
/* Trigger the DMA transfer */
|
||||||
writel(datactrl, host->base + MMCIDATACTRL);
|
mmci_write_datactrlreg(host, datactrl);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Let the MMCI say when the data is ended and it's time
|
* Let the MMCI say when the data is ended and it's time
|
||||||
|
@ -757,7 +768,7 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
|
||||||
irqmask = MCI_TXFIFOHALFEMPTYMASK;
|
irqmask = MCI_TXFIFOHALFEMPTYMASK;
|
||||||
}
|
}
|
||||||
|
|
||||||
writel(datactrl, base + MMCIDATACTRL);
|
mmci_write_datactrlreg(host, datactrl);
|
||||||
writel(readl(base + MMCIMASK0) & ~MCI_DATAENDMASK, base + MMCIMASK0);
|
writel(readl(base + MMCIMASK0) & ~MCI_DATAENDMASK, base + MMCIMASK0);
|
||||||
mmci_set_mask1(host, irqmask);
|
mmci_set_mask1(host, irqmask);
|
||||||
}
|
}
|
||||||
|
|
|
@ -183,6 +183,7 @@ struct mmci_host {
|
||||||
unsigned int cclk;
|
unsigned int cclk;
|
||||||
u32 pwr_reg;
|
u32 pwr_reg;
|
||||||
u32 clk_reg;
|
u32 clk_reg;
|
||||||
|
u32 datactrl_reg;
|
||||||
bool vqmmc_enabled;
|
bool vqmmc_enabled;
|
||||||
struct mmci_platform_data *plat;
|
struct mmci_platform_data *plat;
|
||||||
struct variant_data *variant;
|
struct variant_data *variant;
|
||||||
|
|
Loading…
Reference in a new issue