diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-11-21 08:46:26 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-11-21 15:05:24 +0100 |
| commit | 774e3704de94c329d3319c30bb2fcade9a6a8dd9 (patch) | |
| tree | e378944c91bf11449372d043485e34a5852ecacb | |
| parent | b205234f92db5980ca374de65408f81f6dcf37d8 (diff) | |
mmc: tegra: apalis-tk1: no longer do card detect polling on v1.1 hwApalis_TK1_LinuxImageV2.6.1Beta2_20161122
Now with the working card detect pin in place on the latest V1.1 HW
polling is no longer required. Therefore make it an optional define for
V1.0 samples.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-apalis-tk1.h | 3 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-apalis-tk1.h b/arch/arm/mach-tegra/board-apalis-tk1.h index a3561d0f87d3..b825abb0bdb2 100644 --- a/arch/arm/mach-tegra/board-apalis-tk1.h +++ b/arch/arm/mach-tegra/board-apalis-tk1.h @@ -105,6 +105,9 @@ #define UART2_3_RS232_FOFF_N TEGRA_GPIO_PV3 #endif /* IXORA */ +/* Uncomment for Apalis TK1 V1.0A prototypes and V1.0B samples */ +//#define APALIS_TK1_V10 + /* generated soc_therm OC interrupts */ #define TEGRA_SOC_OC_IRQ_BASE TEGRA_NR_IRQS #define TEGRA_SOC_OC_NUM_IRQ TEGRA_SOC_OC_IRQ_MAX diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index c5ece6947cbf..252757e0e466 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -4340,7 +4340,7 @@ static int sdhci_tegra_probe(struct platform_device *pdev) host->mmc->pm_caps |= plat->pm_caps; host->mmc->pm_flags |= plat->pm_flags; -#ifdef CONFIG_MACH_APALIS_TK1 +#ifdef APALIS_TK1_V10 /* * Enable card detect polling as we can't use SD1_CD# aka * SDMMC3_CLK_LB_OUT for now as it features some magic properties even @@ -4349,7 +4349,7 @@ static int sdhci_tegra_probe(struct platform_device *pdev) * being set to 0xfffd according to the TRM! */ host->mmc->caps |= MMC_CAP_NEEDS_POLL; -#endif /* CONFIG_MACH_APALIS_TK1 */ +#endif /* APALIS_TK1_V10 */ host->mmc->caps |= MMC_CAP_ERASE; /* enable 1/8V DDR capable */ |