diff options
| author | Tom Rini <[email protected]> | 2020-12-09 11:36:41 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-12-09 11:36:41 -0500 |
| commit | 2a42de6df1ac75bd85bdb1dd8580f01895c915cd (patch) | |
| tree | 3bb16ff141b97a686c91caacf6b8584f2c2d4c8d /drivers/mmc | |
| parent | 19ea606109135c3d9892d86e1b1c2a8fb551cc1b (diff) | |
| parent | 9b36b7dc96baedc0ed506246a9822c745cc65b45 (diff) | |
Merge tag 'u-boot-stm32-20201209' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- Manage CONFIG_ENV_EXT4_DEVICE_AND_PART in stm32mp1 board
- Update ARM STI and ARM STM STM32MP Arch maintainers emails
- Enable internal pull-ups for SDMMC1 on DHCOM SoM
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/sti_sdhci.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/stm32_sdmmc2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c index 5578feebef7..c3a1b344427 100644 --- a/drivers/mmc/sti_sdhci.c +++ b/drivers/mmc/sti_sdhci.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved - * Author(s): Patrice Chotard, <[email protected]> for STMicroelectronics. + * Author(s): Patrice Chotard, <[email protected]> for STMicroelectronics. */ #include <common.h> diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c index 77871d5afc9..1f1b6cf4fb5 100644 --- a/drivers/mmc/stm32_sdmmc2.c +++ b/drivers/mmc/stm32_sdmmc2.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved - * Author(s): Patrice Chotard, <[email protected]> for STMicroelectronics. + * Author(s): Patrice Chotard, <[email protected]> for STMicroelectronics. */ #include <common.h> |