mirror of
https://github.com/torvalds/linux.git
synced 2026-06-03 20:14:06 +02:00
mmc: Merge branch fixes into next
Merge the mmc fixes for v7.0-rc[n] into the next branch, to allow them to get tested together with the mmc changes that are targeted for the next release. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
commit
6eba866b0a
|
|
@ -68,6 +68,9 @@
|
|||
#define GLI_9750_MISC_TX1_DLY_VALUE 0x5
|
||||
#define SDHCI_GLI_9750_MISC_SSC_OFF BIT(26)
|
||||
|
||||
#define SDHCI_GLI_9750_GM_BURST_SIZE 0x510
|
||||
#define SDHCI_GLI_9750_GM_BURST_SIZE_R_OSRC_LMT GENMASK(17, 16)
|
||||
|
||||
#define SDHCI_GLI_9750_TUNING_CONTROL 0x540
|
||||
#define SDHCI_GLI_9750_TUNING_CONTROL_EN BIT(4)
|
||||
#define GLI_9750_TUNING_CONTROL_EN_ON 0x1
|
||||
|
|
@ -345,10 +348,16 @@ static void gli_set_9750(struct sdhci_host *host)
|
|||
u32 misc_value;
|
||||
u32 parameter_value;
|
||||
u32 control_value;
|
||||
u32 burst_value;
|
||||
u16 ctrl2;
|
||||
|
||||
gl9750_wt_on(host);
|
||||
|
||||
/* clear R_OSRC_Lmt to avoid DMA write corruption */
|
||||
burst_value = sdhci_readl(host, SDHCI_GLI_9750_GM_BURST_SIZE);
|
||||
burst_value &= ~SDHCI_GLI_9750_GM_BURST_SIZE_R_OSRC_LMT;
|
||||
sdhci_writel(host, burst_value, SDHCI_GLI_9750_GM_BURST_SIZE);
|
||||
|
||||
driving_value = sdhci_readl(host, SDHCI_GLI_9750_DRIVING);
|
||||
pll_value = sdhci_readl(host, SDHCI_GLI_9750_PLL);
|
||||
sw_ctrl_value = sdhci_readl(host, SDHCI_GLI_9750_SW_CTRL);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user