diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-07-27 21:58:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-07-27 21:58:41 +0200 |
| commit | 8b0bf1ee077715ceb0535fbda799038ea62baef8 (patch) | |
| tree | 2ef39a48cc78e4b2ec9d37643d4f7c6c320f0341 /drivers/mci | |
| parent | 67f0e7aedefcb06b38ef50ddd32b0a280bbb10e8 (diff) | |
| parent | a66ffa8dab14b82f9f9edddb03d6358b861ff5c0 (diff) | |
| download | barebox-8b0bf1ee077715ceb0535fbda799038ea62baef8.tar.gz barebox-8b0bf1ee077715ceb0535fbda799038ea62baef8.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/mci')
| -rw-r--r-- | drivers/mci/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/mci/dw_mmc.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig index 3026b25cad..f7dc5c5089 100644 --- a/drivers/mci/Kconfig +++ b/drivers/mci/Kconfig @@ -177,6 +177,7 @@ config MCI_STM32_SDMMC2 bool "STMicroelectronics STM32H7 SD/MMC Host Controller support" depends on ARM_AMBA depends on RESET_CONTROLLER + depends on ARCH_STM32MP || COMPILE_TEST help This selects support for the SD/MMC controller on STM32H7 SoCs. If you have a board based on such a SoC and with a SD/MMC slot, diff --git a/drivers/mci/dw_mmc.c b/drivers/mci/dw_mmc.c index ab8270814b..0ada65e90e 100644 --- a/drivers/mci/dw_mmc.c +++ b/drivers/mci/dw_mmc.c @@ -124,7 +124,7 @@ static int dwmci_prepare_data_dma(struct dwmci_host *host, { unsigned long ctrl; unsigned int i = 0, flags, cnt, blk_cnt; - unsigned long data_start, start_addr; + unsigned start_addr; struct dwmci_idmac *desc = host->idmac; blk_cnt = data->blocks; @@ -134,7 +134,6 @@ static int dwmci_prepare_data_dma(struct dwmci_host *host, dwmci_wait_reset(host, DWMCI_CTRL_FIFO_RESET); - data_start = (uint32_t)desc; dwmci_writel(host, DWMCI_DBADDR, (uint32_t)desc); if (data->flags & MMC_DATA_READ) |