xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: atmel-mci: Remove AVR32 bits from the driver

Browse Source 
AVR32 is gone. Now it's time to clean up the driver by removing
leftovers that was used by AVR32 related code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Andy Shevchenko
2017-05-09 20:21:17 +03:00
committed by Ulf Hansson
parent 675a7da857
commit ef4b160f28
2 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/host/Kconfig
View File

@@ -408,11 +408,11 @@ config MMC_AU1X
config MMC_ATMELMCI config MMC_ATMELMCI
tristate "Atmel SD/MMC Driver (Multimedia Card Interface)" tristate "Atmel SD/MMC Driver (Multimedia Card Interface)"
depends on AVR32 || ARCH_AT91 depends on ARCH_AT91
help help
This selects the Atmel Multimedia Card Interface driver. If This selects the Atmel Multimedia Card Interface driver.
you have an AT32 (AVR32) or AT91 platform with a Multimedia If you have an AT91 platform with a Multimedia Card slot,
Card slot, say Y or M here. say Y or M here.
If unsure, say N. If unsure, say N.

24
drivers/mmc/host/atmel-mci.c
View File

@@ -44,7 +44,7 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
/* /*
* Superset of MCI IP registers integrated in Atmel AVR32 and AT91 Processors * Superset of MCI IP registers integrated in Atmel AT91 Processor
* Registers and bitfields marked with [2] are only available in MCI2 * Registers and bitfields marked with [2] are only available in MCI2
*/ */
@@ -172,13 +172,6 @@
#define atmci_writel(port, reg, value) \ #define atmci_writel(port, reg, value) \
__raw_writel((value), (port)->regs + reg) __raw_writel((value), (port)->regs + reg)
/* On AVR chips the Peripheral DMA Controller is not connected to MCI. */
#ifdef CONFIG_AVR32
# define ATMCI_PDC_CONNECTED 0
#else
# define ATMCI_PDC_CONNECTED 1
#endif
#define AUTOSUSPEND_DELAY 50 #define AUTOSUSPEND_DELAY 50
#define ATMCI_DATA_ERROR_FLAGS (ATMCI_DCRCE | ATMCI_DTOE | ATMCI_OVRE | ATMCI_UNRE) #define ATMCI_DATA_ERROR_FLAGS (ATMCI_DCRCE | ATMCI_DTOE | ATMCI_OVRE | ATMCI_UNRE)
@@ -1549,21 +1542,8 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd); mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
break; break;
default: default:
/*
* TODO: None of the currently available AVR32-based
* boards allow MMC power to be turned off. Implement
* power control when this can be tested properly.
*
* We also need to hook this into the clock management
* somehow so that newly inserted cards aren't
* subjected to a fast clock before we have a chance
* to figure out what the maximum rate is. Currently,
* there's no way to avoid this, and there never will
* be for boards that don't support power control.
*/
break; break;
} }
} }
static int atmci_get_ro(struct mmc_host *mmc) static int atmci_get_ro(struct mmc_host *mmc)
@@ -2464,7 +2444,7 @@ static void atmci_get_cap(struct atmel_mci *host)
"version: 0x%x\n", version); "version: 0x%x\n", version);
host->caps.has_dma_conf_reg = 0; host->caps.has_dma_conf_reg = 0;
host->caps.has_pdc = ATMCI_PDC_CONNECTED; host->caps.has_pdc = 1;
host->caps.has_cfg_reg = 0; host->caps.has_cfg_reg = 0;
host->caps.has_cstor_reg = 0; host->caps.has_cstor_reg = 0;
host->caps.has_highspeed = 0; host->caps.has_highspeed = 0;