Commit 1743fa54 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Jens Axboe
Browse files

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: default avatarDmitry Osipenko <digetx@gmail.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20210820004536.15791-5-digetx@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent dc913385

drivers/mmc/host/sdhci-tegra.c

+9 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ 
 */

#define NVQUIRK_HAS_TMCLK				BIT(10)



#define NVQUIRK_HAS_ANDROID_GPT_SECTOR			BIT(11)



/* SDMMC CQE Base Address for Tegra Host Ver 4.1 and Higher */

#define SDHCI_TEGRA_CQE_BASE_ADDR			0xF000
@@ -1361,6 +1363,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra20 = { 
	.pdata = &sdhci_tegra20_pdata,

	.dma_mask = DMA_BIT_MASK(32),

	.nvquirks = NVQUIRK_FORCE_SDHCI_SPEC_200 |

		    NVQUIRK_HAS_ANDROID_GPT_SECTOR |

		    NVQUIRK_ENABLE_BLOCK_GAP_DET,

};
@@ -1390,6 +1393,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra30 = { 
	.nvquirks = NVQUIRK_ENABLE_SDHCI_SPEC_300 |

		    NVQUIRK_ENABLE_SDR50 |

		    NVQUIRK_ENABLE_SDR104 |

		    NVQUIRK_HAS_ANDROID_GPT_SECTOR |

		    NVQUIRK_HAS_PADCALIB,

};
@@ -1422,6 +1426,7 @@ static const struct sdhci_pltfm_data sdhci_tegra114_pdata = { 
static const struct sdhci_tegra_soc_data soc_data_tegra114 = {

	.pdata = &sdhci_tegra114_pdata,

	.dma_mask = DMA_BIT_MASK(32),

	.nvquirks = NVQUIRK_HAS_ANDROID_GPT_SECTOR,

};



static const struct sdhci_pltfm_data sdhci_tegra124_pdata = {
@@ -1438,6 +1443,7 @@ static const struct sdhci_pltfm_data sdhci_tegra124_pdata = { 
static const struct sdhci_tegra_soc_data soc_data_tegra124 = {

	.pdata = &sdhci_tegra124_pdata,

	.dma_mask = DMA_BIT_MASK(34),

	.nvquirks = NVQUIRK_HAS_ANDROID_GPT_SECTOR,

};



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

	tegra_host->soc_data = soc_data;



	if (soc_data->nvquirks & NVQUIRK_HAS_ANDROID_GPT_SECTOR)

		host->mmc->caps2 |= MMC_CAP2_ALT_GPT_TEGRA;



	if (soc_data->nvquirks & NVQUIRK_NEEDS_PAD_CONTROL) {

		rc = tegra_sdhci_init_pinctrl_info(&pdev->dev, tegra_host);

		if (rc == 0)