diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-08-12 23:48:17 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-08-12 23:48:17 +0300 |
| commit | f3e22d32e4ddef2980ff9c9c401f7b948030e0be (patch) | |
| tree | 8c68368e2520d60db52caaabe2aeb8d7f97772ee /arch/arm/boot/dts/Makefile | |
| parent | 3df512524fa814d17acaef7d534033f2486a7562 (diff) | |
| parent | f9807f9cb396544ab6bdb4f4451505211ca602f7 (diff) | |
| download | linux-f3e22d32e4ddef2980ff9c9c401f7b948030e0be.tar.xz | |
Merge tag 'sti-dt-for-v5.15-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into arm/dt
Highlights:
-----------
- Introduce 4KOpen STiH418-b2264 board
- Remove clk_ignore_unused from STi boards DT
- Remove clock-output-names and clk_critical properties
- Update some clock compatible
* tag 'sti-dt-for-v5.15-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
ARM: dts: sti: remove clk_ignore_unused from bootargs for stih410-b2260
ARM: dts: sti: remove clk_ignore_unused from bootargs for stih418-b2199
ARM: dts: sti: remove clk_ignore_unused from bootargs for stih410-b2120
ARM: dts: sti: remove clk_ignore_unused from bootargs for stih407-b2120
ARM: dts: sti: Introduce 4KOpen (stih418-b2264) board
ARM: dts: sti: add the thermal sensor node within stih418
ARM: dts: sti: disable rng11 on the stih418 platform
ARM: dts: sti: add the spinor controller node within stih407-family
ARM: dts: sti: update clkgen-fsyn entries in stih418-clock
ARM: dts: sti: update clkgen-fsyn entries in stih410-clock
ARM: dts: sti: update clkgen-fsyn entries in stih407-clock
ARM: dts: sti: update clkgen-pll entries in stih418-clock
ARM: dts: sti: update clkgen-pll entries in stih410-clock
ARM: dts: sti: update clkgen-pll entries in stih407-clock
ARM: dts: sti: update flexgen compatible within stih410-clock
ARM: dts: sti: update flexgen compatible within stih407-clock
ARM: dts: sti: update flexgen compatible within stih418-clock
Link: https://lore.kernel.org/r/1d95209f-9cb4-47a3-2696-7a93df7cdc05@foss.st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 91d9b38fd676..09dc626c548b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1079,7 +1079,8 @@ dtb-$(CONFIG_ARCH_STI) += \ stih407-b2120.dtb \ stih410-b2120.dtb \ stih410-b2260.dtb \ - stih418-b2199.dtb + stih418-b2199.dtb \ + stih418-b2264.dtb dtb-$(CONFIG_ARCH_STM32) += \ stm32f429-disco.dtb \ stm32f469-disco.dtb \ |