diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-24 12:26:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-24 12:26:39 -0400 |
| commit | c2bb9c5b9e333c200e3702d9ed5ac9b6095191b6 (patch) | |
| tree | f3a017fe861211d45c8965aeac2f488f06c989d5 /arch/arm/dts/stm32f469-pinctrl.dtsi | |
| parent | ceb6ddbc73607e9395bb5f0ad94159755f049e77 (diff) | |
| parent | c406a474311c1ee3c4303a7e85db4a8e45966e31 (diff) | |
Merge tag 'u-boot-stm32-mcu-20190423' of https://github.com/pchotard/u-boot
STM32 MCUs update:
- DT rework and alignment with DT kernel v4.20
- mmc: arm_pl180_mmci: Synchronize compatible with kernel v4.20
- mmc: stm32_sdmmc2: Synchronize properties with kernel v4.20
- configs: update for F746/769 boards
Diffstat (limited to 'arch/arm/dts/stm32f469-pinctrl.dtsi')
| -rw-r--r-- | arch/arm/dts/stm32f469-pinctrl.dtsi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/dts/stm32f469-pinctrl.dtsi b/arch/arm/dts/stm32f469-pinctrl.dtsi index dd641580c9b..fff542662ee 100644 --- a/arch/arm/dts/stm32f469-pinctrl.dtsi +++ b/arch/arm/dts/stm32f469-pinctrl.dtsi @@ -1,6 +1,5 @@ /* - * Copyright (C) 2017, STMicroelectronics - All Rights Reserved - * Author(s): Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics. + * Copyright 2017 - Alexandre Torgue <alexandre.torgue@st.com> * * This file is dual-licensed: you can use it either under the terms * of the GPL or the X11 license, at your option. Note that this dual |