diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-08 21:14:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-08 21:15:13 -0400 |
| commit | 40e362a9ab5f1d409822942ee89d4473c2e01ee6 (patch) | |
| tree | ad63f4fdcc210a0a758e41528fb2f15ecedf6a31 /arch/arm/include/asm/gpio.h | |
| parent | 2f760735c170c854ffca76be5607cec5c56fdc4f (diff) | |
| parent | cd45d6f3955c919b7f10793014db3dbcfd7df3bb (diff) | |
Merge tag 'mmc-9-6-2019' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
Bug fixes to mmc_spi
Add Aspeed SD driver
Fix dw_mmc timeout calculation
Fix timeout values passed to mmc_wait_dat0
sdhci dt caps/mask update
[trini: Fix evb-ast2500_defconfig CONFIG_MMC line]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/include/asm/gpio.h')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index b9461058ae..6ff5f42424 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -2,7 +2,8 @@ !defined(CONFIG_ARCH_K3) && !defined(CONFIG_ARCH_BCM6858) && \ !defined(CONFIG_ARCH_BCM63158) && !defined(CONFIG_ARCH_ROCKCHIP) && \ !defined(CONFIG_ARCH_LX2160A) && !defined(CONFIG_ARCH_LS1028A) && \ - !defined(CONFIG_ARCH_LS2080A) && !defined(CONFIG_ARCH_LS1088A) + !defined(CONFIG_ARCH_LS2080A) && !defined(CONFIG_ARCH_LS1088A) && \ + !defined(CONFIG_ARCH_ASPEED) #include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> |