Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+9
+9
drivers/mmc/host/sdhci-pci-gli.c
+9
drivers/mmc/host/sdhci-pci-gli.c
···
68
68
#define GLI_9750_MISC_TX1_DLY_VALUE 0x5
69
69
#define SDHCI_GLI_9750_MISC_SSC_OFF BIT(26)
70
70
71
+
#define SDHCI_GLI_9750_GM_BURST_SIZE 0x510
72
+
#define SDHCI_GLI_9750_GM_BURST_SIZE_R_OSRC_LMT GENMASK(17, 16)
73
+
71
74
#define SDHCI_GLI_9750_TUNING_CONTROL 0x540
72
75
#define SDHCI_GLI_9750_TUNING_CONTROL_EN BIT(4)
73
76
#define GLI_9750_TUNING_CONTROL_EN_ON 0x1
···
348
345
u32 misc_value;
349
346
u32 parameter_value;
350
347
u32 control_value;
348
+
u32 burst_value;
351
349
u16 ctrl2;
352
350
353
351
gl9750_wt_on(host);
352
+
353
+
/* clear R_OSRC_Lmt to avoid DMA write corruption */
354
+
burst_value = sdhci_readl(host, SDHCI_GLI_9750_GM_BURST_SIZE);
355
+
burst_value &= ~SDHCI_GLI_9750_GM_BURST_SIZE_R_OSRC_LMT;
356
+
sdhci_writel(host, burst_value, SDHCI_GLI_9750_GM_BURST_SIZE);
354
357
355
358
driving_value = sdhci_readl(host, SDHCI_GLI_9750_DRIVING);
356
359
pll_value = sdhci_readl(host, SDHCI_GLI_9750_PLL);