Skip to content

Commit 1743fa5

Browse files
digetxaxboe
authored andcommitted
mmc: sdhci-tegra: Enable MMC_CAP2_ALT_GPT_TEGRA
Tegra20/30/114/124 Android devices place GPT at a non-standard location. Enable GPT entry scanning at that location. Signed-off-by: Dmitry Osipenko <[email protected]> Acked-by: Thierry Reding <[email protected]> Reviewed-by: Ulf Hansson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent dc91338 commit 1743fa5

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

drivers/mmc/host/sdhci-tegra.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@
116116
*/
117117
#define NVQUIRK_HAS_TMCLK BIT(10)
118118

119+
#define NVQUIRK_HAS_ANDROID_GPT_SECTOR BIT(11)
120+
119121
/* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */
120122
#define SDHCI_TEGRA_CQE_BASE_ADDR 0xF000
121123

@@ -1361,6 +1363,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra20 = {
13611363
.pdata = &sdhci_tegra20_pdata,
13621364
.dma_mask = DMA_BIT_MASK(32),
13631365
.nvquirks = NVQUIRK_FORCE_SDHCI_SPEC_200 |
1366+
NVQUIRK_HAS_ANDROID_GPT_SECTOR |
13641367
NVQUIRK_ENABLE_BLOCK_GAP_DET,
13651368
};
13661369

@@ -1390,6 +1393,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra30 = {
13901393
.nvquirks = NVQUIRK_ENABLE_SDHCI_SPEC_300 |
13911394
NVQUIRK_ENABLE_SDR50 |
13921395
NVQUIRK_ENABLE_SDR104 |
1396+
NVQUIRK_HAS_ANDROID_GPT_SECTOR |
13931397
NVQUIRK_HAS_PADCALIB,
13941398
};
13951399

@@ -1422,6 +1426,7 @@ static const struct sdhci_pltfm_data sdhci_tegra114_pdata = {
14221426
static const struct sdhci_tegra_soc_data soc_data_tegra114 = {
14231427
.pdata = &sdhci_tegra114_pdata,
14241428
.dma_mask = DMA_BIT_MASK(32),
1429+
.nvquirks = NVQUIRK_HAS_ANDROID_GPT_SECTOR,
14251430
};
14261431

14271432
static const struct sdhci_pltfm_data sdhci_tegra124_pdata = {
@@ -1438,6 +1443,7 @@ static const struct sdhci_pltfm_data sdhci_tegra124_pdata = {
14381443
static const struct sdhci_tegra_soc_data soc_data_tegra124 = {
14391444
.pdata = &sdhci_tegra124_pdata,
14401445
.dma_mask = DMA_BIT_MASK(34),
1446+
.nvquirks = NVQUIRK_HAS_ANDROID_GPT_SECTOR,
14411447
};
14421448

14431449
static const struct sdhci_ops tegra210_sdhci_ops = {
@@ -1616,6 +1622,9 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
16161622
tegra_host->pad_control_available = false;
16171623
tegra_host->soc_data = soc_data;
16181624

1625+
if (soc_data->nvquirks & NVQUIRK_HAS_ANDROID_GPT_SECTOR)
1626+
host->mmc->caps2 |= MMC_CAP2_ALT_GPT_TEGRA;
1627+
16191628
if (soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL) {
16201629
rc = tegra_sdhci_init_pinctrl_info(&pdev->dev, tegra_host);
16211630
if (rc == 0)

0 commit comments

Comments
 (0)