diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-01-30 17:26:33 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-01-30 17:27:59 +0100 |
| commit | 6569df3d6280a9c89cd4bb020b44a689ef0783a9 (patch) | |
| tree | cdca48d410c8af732c620aa8ced6baa9e3eb795b /arch/arm/boot/dts/stm32mp157c-ed1.dts | |
| parent | Linux 5.0-rc4 (diff) | |
| parent | ARM: dts: stm32: add thermal sensor support on STM32MP157c (diff) | |
| download | linux-6569df3d6280a9c89cd4bb020b44a689ef0783a9.tar.xz linux-6569df3d6280a9c89cd4bb020b44a689ef0783a9.zip | |
Merge tag 'stm32-dt-for-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/dt
STM32 DT updates for v4.21, round 1
Highlights:
----------
-MPU STM32MP157 platform update:
-Declare DMAs for timers
-Add sleep support for CAN
-Split CAN RAM mapping between the 2 FDCAN instances
-Add support of thermal sensor (DTS)
* tag 'stm32-dt-for-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: dts: stm32: add thermal sensor support on STM32MP157c
ARM: dts: stm32: add can1 sleep pins muxing on stm32mp157c-ev1 board
ARM: dts: stm32: add can1 sleep pins muxing
ARM: dts: stm32: change CAN RAM mapping on stm32mp157c
ARM: dts: stm32: don't use timers dmas on stm32mp157c-ev1
ARM: dts: stm32: don't use timers dmas on stm32mp157c-ed1
ARM: dts: stm32: Add dmas to timer on stm32mp157c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/stm32mp157c-ed1.dts')
| -rw-r--r-- | arch/arm/boot/dts/stm32mp157c-ed1.dts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts index f77bea49c079..c3ecb1e10d94 100644 --- a/arch/arm/boot/dts/stm32mp157c-ed1.dts +++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts @@ -72,6 +72,9 @@ &timers6 { status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; timer@5 { status = "okay"; }; |